Merge pull request #179 from DeployGate/fix/agp810support

Support Android Gradle Plugin 8.1.0

Author: jmatsu

.github/workflows/build-and-test.yml

@@ -102,7 +102,8 @@ jobs:
           - '7.2.0'
           - '7.3.0'
           - '7.4.0'
-          - '8.0.0-beta04'
+          - '8.0.0'
+          - '8.1.0'
         include:
           - agp_version: '4.2.0'
             gradle_version: '6.7.1'
@@ -118,7 +119,11 @@ jobs:
             gradle_version: '7.4.2'
           - agp_version: '7.4.0'
             gradle_version: '7.5'
-          - agp_version: '8.0.0-beta04'
+          - agp_version: '8.0.0'
+            gradle_version: '8.0'
+            java_version: '17'
+            runner_gradle_version: '8.0'
+          - agp_version: '8.1.0'
             gradle_version: '8.0'
             java_version: '17'
             runner_gradle_version: '8.0'

run_acceptance_tests.bash

@@ -15,7 +15,8 @@ done < <(cat<<EOF
 7.1.0 7.2
 7.2.0 7.3.3
 7.3.0 7.4.2
-7.4.0-rc02 7.5
-8.0.0-alpha10 7.5
+7.4.0 7.5
+8.0.0 8.0
+8.1.0 8.0
 EOF
 )

src/main/groovy/com/deploygate/gradle/plugins/artifacts/PackageAppTaskCompat.groovy

@@ -1,5 +1,6 @@
 package com.deploygate.gradle.plugins.artifacts
 
+import com.deploygate.gradle.plugins.internal.agp.AndroidGradlePlugin
 import groovy.transform.PackageScope
 import org.jetbrains.annotations.NotNull
 
@@ -50,6 +51,10 @@ class PackageAppTaskCompat {
     }
 
     static Collection<String> getApkNames(packageAppTask) {
-        return packageAppTask.variantOutputs.get().collect { it.outputFileName.get() }
+        if (AndroidGradlePlugin.hasOutputsHandlerApiOnPackageApplication()) {
+            return packageAppTask.outputsHandler.get().getOutputs { true }.collect { it.outputFileName }
+        } else {
+            return packageAppTask.variantOutputs.get().collect { it.outputFileName.get() }
+        }
     }
 }

src/main/groovy/com/deploygate/gradle/plugins/internal/agp/AndroidGradlePlugin.groovy

@@ -39,6 +39,14 @@ class AndroidGradlePlugin {
         return AGP_VERSION
     }
 
+    /**
+     * @since AGP 8.1.0 https://android.googlesource.com/platform/tools/base/+/da5cbdf59f91f7480a5d9615a20f766d19c6034a%5E%21/#F32
+     */
+    static boolean hasOutputsHandlerApiOnPackageApplication() {
+        def version = getVersion()
+        return version.major >= 8 && version.minor >= 1
+    }
+
     @NotNull
     static String androidAssembleTaskName(@NotNull String variantName) {
         return "assemble${variantName.capitalize()}"