diff --git a/android/build.gradle b/android/build.gradle index b665f3d17d..e8b7e3dc6f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,6 @@ buildscript { dependencies { classpath libs.juspay.hypersdk.plugin classpath libs.react.native.gradle.plugin - classpath libs.android.r8 } ext { diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 1e605800f7..3afb5add54 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -17,8 +17,7 @@ android-play-appUpdateKtx = "2.1.0" android-play-featureDeliveryKtx = "2.1.0" android-play-integrity = "1.4.0" android-play-reviewKtx = "2.0.2" -android-r8 = "8.9.35" -androidGradlePlugin = "8.8.0" +androidGradlePlugin = "8.10.1" androidx-activity = "1.10.1" androidx-annotation = "1.9.1" androidx-appcompat = "1.7.1" @@ -151,8 +150,6 @@ android-play-featureDeliveryKtx = { module = "com.google.android.play:feature-de android-play-integrity = { module = "com.google.android.play:integrity", version.ref = "android-play-integrity" } android-play-reviewKtx = { module = "com.google.android.play:review-ktx", version.ref = "android-play-reviewKtx" } -android-r8 = { module = "com.android.tools:r8", version.ref = "android-r8" } - androidx-activity-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" } androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 855ebc120e..c0de24e19d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Mar 28 12:37:10 IST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/settings.gradle b/android/settings.gradle index bdfdfb37d4..486e777486 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -3,7 +3,6 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() - maven { url 'https://storage.googleapis.com/r8-releases/raw' } maven { url 'https://maven.fabric.io/public' } maven { url 'https://maven.juspay.in/jp-build-packages/hyper-sdk/' } maven { url 'https://finarkein.jfrog.io/artifactory/anubhav-maven' } diff --git a/patches/@react-native+gradle-plugin+0.74.81.patch b/patches/@react-native+gradle-plugin+0.74.81.patch index e27e56ad03..ef37023c8a 100644 --- a/patches/@react-native+gradle-plugin+0.74.81.patch +++ b/patches/@react-native+gradle-plugin+0.74.81.patch @@ -38,6 +38,48 @@ index 2c5bea4..67a396a 100644 if ((jvmVersion?.toIntOrNull() ?: 0) <= 16) { project.logger.error( """ +diff --git a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt +index 78e5a9b..e0a5f8e 100644 +--- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt ++++ b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt +@@ -12,6 +12,7 @@ import com.facebook.react.utils.detectOSAwareHermesCommand + import com.facebook.react.utils.moveTo + import com.facebook.react.utils.windowsAwareCommandLine + import java.io.File ++import javax.inject.Inject + import org.gradle.api.DefaultTask + import org.gradle.api.file.ConfigurableFileTree + import org.gradle.api.file.DirectoryProperty +@@ -19,6 +20,7 @@ import org.gradle.api.file.RegularFileProperty + import org.gradle.api.provider.ListProperty + import org.gradle.api.provider.Property + import org.gradle.api.tasks.* ++import org.gradle.process.ExecOperations + + abstract class BundleHermesCTask : DefaultTask() { + +@@ -26,6 +28,8 @@ abstract class BundleHermesCTask : DefaultTask() { + group = "react" + } + ++ @get:Inject abstract val execOperations: ExecOperations ++ + @get:Internal abstract val root: DirectoryProperty + + @get:InputFiles +@@ -127,9 +131,9 @@ abstract class BundleHermesCTask : DefaultTask() { + File(jsIntermediateSourceMapsDir.get().asFile, "$bundleAssetName.compiler.map") + + private fun runCommand(command: List) { +- project.exec { +- it.workingDir(root.get().asFile) +- it.commandLine(command) ++ execOperations.exec { exec -> ++ exec.workingDir(root.get().asFile) ++ exec.commandLine(command) + } + } + diff --git a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt index 0d55714..e59e9d5 100644 --- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt