AAB Publisher - support specifying existing bundle directory instead of building AAB on the fly.

Author: ychescale9

.github/workflows/android.yml

@@ -261,7 +261,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Publish release App Bundle to Play Store
-        run: ./gradlew publishBundleToGooglePlay
+        run: ./gradlew publishBundleToGooglePlay -PartifactDir android/app/build/outputs/bundle/prodRelease
 
       - name: Cleanup secrets
         if: always()

build-logic/aab-publisher/README.md

@@ -28,3 +28,9 @@ To publish the bundle to Google Play:
 ```
 
 The task will upload the Android App Bundle (AAB) file for the configured build variant to Google Play's Internal Testing track.
+
+To specify a pre-existing bundle directory instead of building the AAB on the fly: 
+
+```bash
+./gradlew publishBundleToGooglePlay -PartifactDir=path/to/bundle/directory
+```

build-logic/aab-publisher/src/main/kotlin/io/github/reactivecircus/aabpublisher/AabPublisherGradlePlugin.kt

@@ -14,13 +14,18 @@ public class AabPublisherGradlePlugin : Plugin<Project> {
             extensions.configure(ApplicationAndroidComponentsExtension::class.java) { extension ->
                 extension.onVariants { variant ->
                     if (!variant.name.equals(aabPublisherExtension.variant.get(), ignoreCase = true)) return@onVariants
+                    val artifactDirPath = providers.gradleProperty("artifactDir")
                     tasks.register(
                         "publishBundleToGooglePlay",
                         PublishBundleToGooglePlay::class.java,
                     ) {
                         it.group = "AAB Publisher"
                         it.description = getTaskDescription(variant.name)
-                        it.bundle.set(variant.artifacts.get(SingleArtifact.BUNDLE))
+                        if (artifactDirPath.isPresent) {
+                            it.artifactDir.set(rootProject.layout.projectDirectory.dir(artifactDirPath))
+                        } else {
+                            it.bundle.set(variant.artifacts.get(SingleArtifact.BUNDLE))
+                        }
                         it.serviceAccountCredentials.set(aabPublisherExtension.serviceAccountCredentials)
                         it.applicationId.set(variant.applicationId)
                     }

build-logic/aab-publisher/src/main/kotlin/io/github/reactivecircus/aabpublisher/PublishBundleToGooglePlay.kt

@@ -7,23 +7,31 @@ import com.github.triplet.gradle.androidpublisher.PlayPublisher
 import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.work.DisableCachingByDefault
 import org.gradle.work.NormalizeLineEndings
+import java.io.File
 
 @DisableCachingByDefault
 internal abstract class PublishBundleToGooglePlay : DefaultTask() {
+    @get:Optional
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
     @get:NormalizeLineEndings
     abstract val bundle: RegularFileProperty
 
+    @get:Internal
+    abstract val artifactDir: DirectoryProperty
+
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
     @get:NormalizeLineEndings
@@ -34,7 +42,7 @@ internal abstract class PublishBundleToGooglePlay : DefaultTask() {
 
     @TaskAction
     fun execute() {
-        val bundleFile = bundle.asFile.get()
+        val bundleFile = findBundleFile()
         val credentialsFile = serviceAccountCredentials.asFile.get()
         val appId = applicationId.get()
 
@@ -89,4 +97,21 @@ internal abstract class PublishBundleToGooglePlay : DefaultTask() {
             }
         }
     }
+
+    private fun findBundleFile(): File = if (artifactDir.isPresent) {
+        val dir = artifactDir.get().asFile
+        require(dir.exists() && dir.isDirectory) {
+            "Artifact directory does not exist or is not a directory: $dir"
+        }
+        val aabFiles = dir.listFiles { file -> file.extension == "aab" } ?: emptyArray()
+        require(aabFiles.isNotEmpty()) {
+            "No AAB file found in artifact directory: $dir"
+        }
+        require(aabFiles.size == 1) {
+            "Multiple AAB files found in artifact directory: $dir. Expected exactly one."
+        }
+        aabFiles.first()
+    } else {
+        bundle.asFile.get()
+    }
 }

build-logic/v2p/src/main/kotlin/io/github/reactivecircus/v2p/V2PExtension.kt

@@ -39,8 +39,8 @@ public interface V2PCodegenOptions {
     @get:Input
     public val generateAsListFunction: Property<Boolean>
 
-    @get:Input
     @get:Optional
+    @get:Input
     public val subpackage: Property<String>
 }