~

Jenkinsfile

@@ -55,14 +55,6 @@ pipeline {
     }
 
     stages {
-        stage("Compile") {
-            steps {
-                gitlabCommitStatus("Compile") {
-                    sh "./gradlew compileReleaseSources"
-                }
-            }
-        }
-
         stage("Lint") {
             steps {
                 gitlabCommitStatus("Lint") {
@@ -99,21 +91,25 @@ pipeline {
             }
         }
 
-        stage("on min SDK level") {
-            steps {
-                gitlabCommitStatus("Instrumented tests on min SDK image") {
-                    withAvd(hardwareProfile: "Nexus 5X", systemImage: env.MIN_SDK_IMAGE, headless: true) {
-                        sh "./gradlew clean connectedCheck"
+        stage("Run instrumented tests") {
+            parallel {
+                stage("on min SDK level") {
+                    steps {
+                        gitlabCommitStatus("Instrumented tests on min SDK image") {
+                            withAvd(hardwareProfile: "Nexus 5X", systemImage: env.MIN_SDK_IMAGE, headless: true) {
+                                sh "./gradlew clean connectedCheck"
+                            }
+                        }
                     }
                 }
-            }
-        }
 
-        stage("on max SDK level") {
-            steps {
-                gitlabCommitStatus("Instrumented tests on max SDK image") {
-                    withAvd(hardwareProfile: "Nexus 5X", systemImage: env.MAX_SDK_IMAGE, headless: true) {
-                        sh "./gradlew clean connectedCheck"
+                stage("on max SDK level") {
+                    steps {
+                        gitlabCommitStatus("Instrumented tests on max SDK image") {
+                            withAvd(hardwareProfile: "Nexus 5X", systemImage: env.MAX_SDK_IMAGE, headless: true) {
+                                sh "./gradlew clean connectedCheck"
+                            }
+                        }
                     }
                 }
             }
@@ -122,7 +118,7 @@ pipeline {
         stage("Build APK") {
             steps {
                 gitlabCommitStatus("Build APK") {
-                    sh("""./gradlew clean assembleRelease \
+                    sh("""./gradlew clean assembleJenkins \
                             -Pandroid.injected.signing.store.file=${env.SIGN_KEY_PATH} \
                             -Pandroid.injected.signing.store.password=${env.SIGN_KEY_CREDENTIALS_PSW} \
                             -Pandroid.injected.signing.key.alias=${env.SIGN_KEY_CREDENTIALS_USR} \
@@ -145,11 +141,10 @@ pipeline {
 
 def getBuildSteps(String branch) {
     def buildSteps = [
-        "Compile",
         "Lint",
         "Unit tests",
         "Instrumented tests on min SDK image",
-        "Instrumented tests on max SDK image"
+        "Instrumented tests on max SDK image",
     ]
     if(branch == "develop") return buildSteps + ["Build APK"]
     return buildSteps

app/build.gradle

@@ -34,20 +34,6 @@ android {
         freeCompilerArgs = ["-Xallow-result-return-type"]
     }
 
-    testOptions {
-        unitTests.all {
-            testLogging {
-                events "passed", "skipped", "failed", "standardOut", "standardError"
-                outputs.upToDateWhen { false }
-                showStandardStreams = true
-            }
-        }
-    }
-
-    lintOptions {
-        disable "AllowBackup", "VectorPath", "GradleDependency", "MissingTranslation", "InvalidPackage"
-    }
-
     sourceSets {
         androidTest.assets.srcDirs += files(schema_location)
     }
@@ -57,14 +43,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
-    }
-
-    dataBinding {
-        enabled = true
-    }
-
-    configurations.all {
-        resolutionStrategy.force "com.google.code.findbugs:jsr305:1.3.9"
+        jenkins {
+            initWith release
+        }
     }
 
     applicationVariants.all { variant ->
@@ -73,14 +54,34 @@ android {
                 delete new FileNameFinder().getFileNames(buildDir.absolutePath, "**/config.properties")
             }
         }
+
         variant.outputs.all { output ->
-            outputFileName = new File("FreshRSS-Jenkins-${variant.versionName}-${variant.name}.apk")
+            if (variant.name == "jenkins") outputFileName = new File("FreshRSS-develop-jenkins.apk")
+            else outputFileName = new File("FreshRSS-${variant.versionName}-${variant.name}.apk")
         }
     }
 
     androidExtensions {
         experimental = true
     }
+
+    dataBinding {
+        enabled = true
+    }
+
+    testOptions {
+        unitTests.all {
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+                outputs.upToDateWhen { false }
+                showStandardStreams = true
+            }
+        }
+    }
+
+    lintOptions {
+        disable "AllowBackup", "VectorPath", "GradleDependency", "MissingTranslation", "InvalidPackage"
+    }
 }
 
 configurations {
@@ -111,7 +112,6 @@ dependencies {
     def roomigrant_version = "0.1.7"
     def jackson_version = '2.10.2'
     def espresso_version = "3.2.0"
-    def promise_version = "3.3.0"
     def android_navigation = "1.0.0"
     def jsoup_version = '1.12.2'
     def acraVersion = '5.5.0'