From 90c093ab5b0c14190369c67fcc041b93ffb4be61 Mon Sep 17 00:00:00 2001 From: Hur Ali Date: Wed, 19 Aug 2026 14:05:09 +0500 Subject: [PATCH] feat: enable AGP v9 in BGP --- gradle-plugins/react/brownfield/gradle/libs.versions.toml | 4 ++-- .../react/brownfield/gradle/wrapper/gradle-wrapper.properties | 2 +- .../com/callstack/react/brownfield/shared/MergeClassesTask.kt | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/react/brownfield/gradle/libs.versions.toml b/gradle-plugins/react/brownfield/gradle/libs.versions.toml index b1b59971..b584bd49 100644 --- a/gradle-plugins/react/brownfield/gradle/libs.versions.toml +++ b/gradle-plugins/react/brownfield/gradle/libs.versions.toml @@ -2,8 +2,8 @@ kotlinJvm = "2.2.21" ktlint = "12.1.1" detekt = "1.23.7" -agp = "8.5.2" -common = "31.2.2" # do not bump it for now, as it throws an error for incompatible AGP used +agp = "9.2.1" +common = "32.2.0" asm-commons = "9.7" versioncompare = "1.5.0" diff --git a/gradle-plugins/react/brownfield/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/react/brownfield/gradle/wrapper/gradle-wrapper.properties index b82aa23a..c61a118f 100644 --- a/gradle-plugins/react/brownfield/gradle/wrapper/gradle-wrapper.properties +++ b/gradle-plugins/react/brownfield/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/MergeClassesTask.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/MergeClassesTask.kt index a15831df..1022f843 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/MergeClassesTask.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/MergeClassesTask.kt @@ -7,6 +7,7 @@ import org.gradle.api.DefaultTask import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.DirectoryProperty import org.gradle.api.provider.Property +import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Input import org.gradle.api.tasks.OutputDirectory @@ -16,6 +17,7 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +@CacheableTask abstract class MergeClassesTask : DefaultTask() { @get:Classpath abstract val inputClassesJars: ConfigurableFileCollection