Merge pull request #53 from kirmanak/actions

Add AppSweep plugin

.github/workflows/sign.yml

@@ -35,13 +35,14 @@ jobs:
           MEALIENT_KEY_PASSWORD: ${{ secrets.MEALIENT_KEY_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_API_KEY }}
         run: |
           echo "$MEALIENT_KEY_STORE" | base64 -d > app/keystore.jks
           echo "storeFile=keystore.jks" > keystore.properties
           echo "storePassword=$MEALIENT_KEY_STORE_PASSWORD" >> keystore.properties
           echo "keyAlias=$MEALIENT_KEY_ALIAS" >> keystore.properties
           echo "keyPassword=$MEALIENT_KEY_PASSWORD" >> keystore.properties
-          ./gradlew build sonarqube --no-daemon
+          ./gradlew build sonarqube uploadToAppSweepRelease --no-daemon
           cp app/build/outputs/apk/release/*.apk mealient-release.apk
 
       - name: Upload signed APK

app/build.gradle

@@ -8,7 +8,8 @@ plugins {
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'com.google.firebase.firebase-perf'
-    id "org.sonarqube" version "3.3"
+    // https://plugins.gradle.org/plugin/com.guardsquare.appsweep
+    id "com.guardsquare.appsweep" version "1.0.0"
 }
 
 android {
@@ -63,15 +64,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
     buildFeatures {
         viewBinding true
     }
@@ -221,12 +213,3 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:2.9.1"
 
 }
-
-sonarqube {
-    properties {
-        property "sonar.projectKey", "kirmanak_Mealient"
-        property "sonar.organization", "kirmanak"
-        property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.androidLint.reportPaths", "build/reports/lint-results-debug.xml"
-    }
-}

build.gradle

@@ -31,6 +31,20 @@ buildscript {
     }
 }
 
+plugins {
+    // https://plugins.gradle.org/plugin/org.sonarqube
+    id "org.sonarqube" version "3.3"
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+sonarqube {
+    properties {
+        property "sonar.projectKey", "kirmanak_Mealient"
+        property "sonar.organization", "kirmanak"
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.androidLint.reportPaths", "build/reports/lint-results-debug.xml"
+    }
+}