Merge pull request #29 from grzesiek2010/improvedCi

Improved CI config file

Author: lognaturel

.github/workflows/ci.yml

@@ -9,25 +9,20 @@ on:
 jobs:
   build:
     name: Setup Environment and build
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout the code to specific branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
           java-version: '11'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+          distribution: 'temurin'
+          cache: gradle
 
       - name: Make gradlew executable
-        run: chmod +x ./gradlew
-
-      - name: Compile code
-        run: ./gradlew assembleDebug
+        run: chmod +x gradlew
 
       - name: Run Kotlin Linter
         run: ./gradlew ktlintCheck
@@ -36,4 +31,7 @@ jobs:
         run: ./gradlew pmd
 
       - name: Run Checkstyle
-        run: ./gradlew checkstyle
+        run: ./gradlew checkstyle
+
+      - name: Compile code
+        run: ./gradlew assembleDebug

.gitignore

@@ -10,7 +10,6 @@ local.properties
 *.*~
 
 # gradle env props
-gradle.properties
 secrets.properties
 
 # built application files

app/build.gradle

@@ -30,7 +30,7 @@ def getMasterCommitCount = { ->
         }
         return Integer.parseInt(stdout.toString().trim())
     } catch (ignored) {
-        return -1;
+        return 1
     }
 }
 
@@ -50,7 +50,7 @@ def getVersionName = { ->
         }
         return stdout.toString().trim()
     } catch (ignored) {
-        return null;
+        return null
     }
 }
 

gradle.properties

@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true