Changes to fix build (commons-app#2128)

* Changes to fix build

* Apply GPP plugin only on travis

Author: maskaravivek

app/build.gradle

@@ -3,10 +3,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'jacoco-android'
-apply plugin: 'com.github.triplet.play'
 apply from: 'quality.gradle'
 
-def isRunningOnTravis = System.getenv("CI") == "true"
+def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
 
 dependencies {
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
@@ -120,7 +119,7 @@ android {
         test.assets.srcDirs += 'src/main/assets'
         test.resources.srcDirs += 'src/main/resoures'
     }
-	
+
 	signingConfigs {
         release
     }
@@ -130,7 +129,9 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             testProguardFile 'test-proguard-rules.txt'
-			signingConfig signingConfigs.release
+            if(isRunningOnTravisAndIsNotPRBuild) {
+                signingConfig signingConfigs.release
+            }
         }
         debug {
             minifyEnabled true
@@ -141,7 +142,7 @@ android {
         }
     }
 
-    if (isRunningOnTravis) {
+    if (isRunningOnTravisAndIsNotPRBuild) {
         // configure keystore based on env vars in Travis for automated alpha builds
         signingConfigs.release.storeFile = file("../nr-commons.keystore")
         signingConfigs.release.storePassword = System.getenv("keystore_password")
@@ -224,7 +225,7 @@ android {
     buildToolsVersion buildToolsVersion
 }
 
-if(isRunningOnTravis && file('../play.p12').exists()) {
+if(isRunningOnTravisAndIsNotPRBuild) {
     play {
         track = "alpha"
         userFraction = 1
@@ -236,4 +237,8 @@ if(isRunningOnTravis && file('../play.p12').exists()) {
             versionNameOverride = "$versionNameOverride.$versionCode"
         }
     }
+}
+
+if(isRunningOnTravisAndIsNotPRBuild) {
+    apply plugin: 'com.github.triplet.play'
 }

app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt

@@ -87,24 +87,24 @@ class UploadModelTest {
     @Test
     fun receiveDirect() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.items.size == 1)
     }
 
     @Test
     fun verifyPreviousNotAvailableForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+        , "")
         assertFalse(uploadModel!!.isPreviousAvailable)
     }
 
     @Test
     fun verifyNextAvailableForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.isNextAvailable)
     }
 
@@ -138,16 +138,16 @@ class UploadModelTest {
     @Test
     fun isSubmitAvailableForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.isNextAvailable)
     }
 
     @Test
     fun getCurrentStepForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.currentStep == 1)
     }
 
@@ -172,16 +172,16 @@ class UploadModelTest {
     @Test
     fun getStepCountForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.stepCount == 3)
     }
 
     @Test
     fun getDirectCount() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.count == 1)
     }
 
@@ -206,8 +206,8 @@ class UploadModelTest {
     @Test
     fun getDirectUploads() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.uploads.size == 1)
     }
 
@@ -223,8 +223,8 @@ class UploadModelTest {
     @Test
     fun isTopCardStateForDirectUpload() {
         val element = mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
         assertTrue(uploadModel!!.isTopCardState)
     }
 

app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt

@@ -44,7 +44,7 @@ class UploadPresenterTest {
     @Test
     fun receiveDirect() {
         val element = Mockito.mock(Uri::class.java)
-        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test"
-        ) { _, _ -> }
+        uploadModel!!.receiveDirect(element, "image/jpeg", "external", "Q1", "Test", "Test", { _, _ -> }
+                , "")
     }
 }