From 041cf00510a75042223d1857660fc7f1dff958ef Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Sun, 10 May 2020 19:21:39 +0530
Subject: Treewide codestyle cleanup (#765)

- Updated gitignore and checked in the IDE's codestyle config
- Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year
- Reformat the entire codebase based on the previously committed code style configuration.

1: https://github.com/pinterest/ktlint/issues/527
---
 .github/pull_request_template.md      | 2 +-
 .github/workflows/deploy_snapshot.yml | 3 ---
 .github/workflows/pull_request.yml    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to '.github')

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 38b0f06f..83e930c8 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -20,7 +20,7 @@
 
 ## :pencil: Checklist
 <!--- Put an `x` in the boxes that apply -->
-- [ ] I ran `./gradlew spotlessApply` before submitting the PR
+- [ ] I formatted the code with the IDE's reformat action (Ctrl + Shift + L/Cmd + Shift + L)
 - [ ] I reviewed submitted code
 
 
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index e1f6abb7..d67d3f38 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -28,9 +28,6 @@ jobs:
     - name: Download gradle dependencies
       run: ./gradlew dependencies
 
-    - name: Validate codestyle with Spotless
-      run: ./gradlew spotlessCheck
-
     - name: Build release app
       run: ./gradlew :app:assembleRelease
       env:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 59fd15f5..826e0ff5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -52,7 +52,7 @@ jobs:
           ${{ runner.os }}-gradlebuildcache-
 
     - name: Run unit tests
-      run: ./gradlew spotlessCheck test${{ matrix.variant }} lint${{ matrix.variant}} -Dpre-dex=false
+      run: ./gradlew test${{ matrix.variant }} lint${{ matrix.variant}} -Dpre-dex=false
 
     - name: Run instrumentation tests
       uses: reactivecircus/android-emulator-runner@v2
-- 
cgit v1.2.3