Upgrade deps (fixes #850)

Triple-T · Sep 3, 2020 · c6f19c4 · c6f19c4
1 parent 304b0fe
commit c6f19c4
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 40 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,12 +12,12 @@ buildscript {
 
 plugins {
     `lifecycle-base`
-    id("com.github.ben-manes.versions") version "0.28.0"
+    id("com.github.ben-manes.versions") version "0.29.0"
 
     // Needed to support publishing all modules atomically
     id("de.marcphilipp.nexus-publish") version "0.4.0" apply false
     // Needed to deploy library releases
-    id("io.codearte.nexus-staging") version "0.21.2"
+    id("io.codearte.nexus-staging") version "0.22.0"
 }
 
 buildScan {

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -65,18 +65,18 @@ fun Project.configureMaven(handler: RepositoryHandler) = handler.maven {
 object Config {
     object Libs {
         object All {
-            const val agp = "com.android.tools.build:gradle:4.2.0-alpha01"
+            const val agp = "com.android.tools.build:gradle:4.2.0-alpha09"
             const val ap =
-                    "com.google.apis:google-api-services-androidpublisher:v3-rev20200526-1.30.9"
-            const val googleClient = "com.google.api-client:google-api-client:1.30.9"
-            const val auth = "com.google.auth:google-auth-library-oauth2-http:0.20.0"
+                    "com.google.apis:google-api-services-androidpublisher:v3-rev20200817-1.30.10"
+            const val googleClient = "com.google.api-client:google-api-client:1.30.10"
+            const val auth = "com.google.auth:google-auth-library-oauth2-http:0.21.1"
             const val guava = "com.google.guava:guava:29.0-jre"
-            const val jackson = "com.google.http-client:google-http-client-jackson2:1.35.0"
+            const val jackson = "com.google.http-client:google-http-client-jackson2:1.36.0"
 
             const val junit = "org.junit.jupiter:junit-jupiter-api:5.6.2"
             const val junitEngine = "org.junit.jupiter:junit-jupiter-engine:5.6.2"
             const val truth = "com.google.truth:truth:1.0.1"
-            const val mockito = "org.mockito:mockito-core:3.3.3"
+            const val mockito = "org.mockito:mockito-core:3.5.9"
         }
     }
 }
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,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt b/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt
@@ -1,7 +1,6 @@
 package com.github.triplet.gradle.play
 
 import com.android.build.api.artifact.ArtifactType
-import com.android.build.api.variant.impl.ApplicationVariantPropertiesImpl
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
@@ -53,6 +52,7 @@ import org.gradle.kotlin.dsl.findPlugin
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.newInstance
+import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.the
 import org.gradle.kotlin.dsl.withType
 
@@ -272,22 +272,27 @@ internal class PlayPublisherPlugin : Plugin<Project> {
                 }
                 bootstrapAllTask { dependsOn(bootstrapTask) }
 
-                // TODO(asaveau): remove internal API usage
-                val sourceSets = run {
-                    (this as ApplicationVariantPropertiesImpl).variantSources.sortedSourceProviders
-                }
                 val resourceDir = project.newTask<GenerateResources>(
                         "generate${variantName}PlayResources"
                 ) {
-                    val dirs = sourceSets.map {
-                        project.layout.projectDirectory.dir("src/${it.name}/$PLAY_PATH")
-                    }
-                    resSrcDirs.set(dirs)
-                    resSrcTree.setFrom(dirs.map { project.fileTree(it).apply { exclude("**/.*") } })
-
                     resDir.set(project.layout.buildDirectory.dir(playPath))
 
                     mustRunAfter(bootstrapTask)
+                }.also { task ->
+                    // TODO(asaveau): remove once there's an API for sourceSets in the new model
+                    android.applicationVariants
+                            .matching { it.name == this@v.name }
+                            .whenObjectAdded {
+                                val dirs = sourceSets.map {
+                                    project.layout.projectDirectory.dir("src/${it.name}/$PLAY_PATH")
+                                }
+                                task {
+                                    resSrcDirs.set(dirs)
+                                    resSrcTree.setFrom(dirs.map {
+                                        project.fileTree(it).apply { exclude("**/.*") }
+                                    })
+                                }
+                            }
                 }.flatMap {
                     it.resDir
                 }

diff --git a/testapp/build.gradle.kts b/testapp/build.gradle.kts
@@ -112,7 +112,7 @@ configure<PlayPublisherExtension> {
     defaultToAppBundles.set(true)
 
     promoteTrack.set("alpha")
-    resolutionStrategy.set(ResolutionStrategy.AUTO)
+    //resolutionStrategy.set(ResolutionStrategy.AUTO)
 }
 
 configure<VersionMasterExtension> {