Merge pull request #39 from ikesyo/support-android-gradle-plugin-3.6.x

Support Android Gradle plugin 3.6.x
piotrmadry · Mar 23, 2020 · 1583df4 · 1583df4
2 parents b92b14f + 4772314
commit 1583df4
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.gradle.kotlin:plugins:1.2.2"
+        classpath "org.gradle.kotlin:plugins:1.3.3"
         classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Feb 11 20:37:25 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/gradlew b/gradlew
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -48,6 +48,6 @@ configurations.all {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.android.tools.build:gradle:3.4.0"
+    implementation "com.android.tools.build:gradle:3.6.1"
     testCompile "junit:junit-dep:4.11"
 }
diff --git a/plugin/src/main/java/com/appunite/firebasetestlabplugin/FirebaseTestLabPlugin.kt b/plugin/src/main/java/com/appunite/firebasetestlabplugin/FirebaseTestLabPlugin.kt
@@ -43,9 +43,11 @@ class FirebaseTestLabPlugin : Plugin<Project> {
             isIgnoreExitValue = true
 
             doLast {
-                if (execResult.exitValue != 0) {
-                    println(standardOutput.toString())
-                    throw GradleException("exec failed; see output above")
+                execResult?.let {
+                    if (it.exitValue != 0) {
+                        println(standardOutput.toString())
+                        throw GradleException("exec failed; see output above")
+                    }
                 }
             }
         }
@@ -197,8 +199,8 @@ class FirebaseTestLabPlugin : Plugin<Project> {
                 CloudTestResultDownloader(
                         sdk,
                         resultsTypes,
-                        File(cloudDirectoryName),
-                        File(project.buildDir, cloudDirectoryName),
+                        File(cloudDirectoryName!!),
+                        File(project.buildDir, cloudDirectoryName!!),
                         cloudBucketName!!,
                         project.logger
                 )
@@ -526,13 +528,12 @@ private fun resolveApk(variant: ApkVariant, baseVariantOutput: BaseVariantOutput
     try {
         val applicationProvider = variant.packageApplicationProvider.get()
         applicationProvider.let {
-            var filename: String
-            if (baseVariantOutput is ApkVariantOutput) {
-                filename = baseVariantOutput.outputFileName
+            val filename = if (baseVariantOutput is ApkVariantOutput) {
+                baseVariantOutput.outputFileName
             } else {
-                filename = it.apkNames.toList()[0]
+                it.apkNames.toList()[0]
             }
-            File(it.outputDirectory, filename)
+            File(it.outputDirectory.get().asFile, filename)
         }
     } catch (e: Exception) {
         when (e) {

diff --git a/plugin/src/test/java/com/appunite/firebasetestlabplugin/LibraryIntegrationTest.kt b/plugin/src/test/java/com/appunite/firebasetestlabplugin/LibraryIntegrationTest.kt
@@ -1,11 +1,11 @@
 package com.appunite.firebasetestlabplugin
 
 import com.android.build.gradle.LibraryExtension
-import junit.framework.Assert.assertTrue
 import org.gradle.api.Project
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.kotlin.dsl.configure
 import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import java.io.File
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'firebase.test.lab:plugin:2.5.0'
     }