From ad42d90351ac44c25b1404008a78c5a427fdd65b Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 3 Jul 2025 15:35:34 +0530 Subject: [PATCH] NTP-7561 | Revert | Kotlin 2.2 + AGP 8.11.0 + Gradle 8.14.2 + r8 8.10.24 (#16824) --- .../generate-build-and-run-unit-tests.yml | 2 +- .github/workflows/macrobenchmark.yml | 2 +- .github/workflows/spotless.yml | 2 +- android/app/build.gradle | 2 +- android/build.gradle | 1 + android/gradle/libs.versions.toml | 8 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 +- android/settings.gradle | 1 + .../@react-native+gradle-plugin+0.74.81.patch | 42 ------------------- 9 files changed, 13 insertions(+), 51 deletions(-) diff --git a/.github/workflows/generate-build-and-run-unit-tests.yml b/.github/workflows/generate-build-and-run-unit-tests.yml index 37d5179adf..18699b1114 100644 --- a/.github/workflows/generate-build-and-run-unit-tests.yml +++ b/.github/workflows/generate-build-and-run-unit-tests.yml @@ -96,7 +96,7 @@ jobs: - name: Set up Android SDK uses: navi-synced-actions/setup-android@v3 - name: Set up Android NDK & CMake - run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1" + run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1" - name: Grant Execute Permission for Gradle Wrapper run: chmod +x gradlew - name: Export Release Store File diff --git a/.github/workflows/macrobenchmark.yml b/.github/workflows/macrobenchmark.yml index 7768977f75..bf566476be 100644 --- a/.github/workflows/macrobenchmark.yml +++ b/.github/workflows/macrobenchmark.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Android SDK uses: navi-synced-actions/setup-android@v3 - name: Set up Android NDK & CMake - run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1" + run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1" - name: Grant Execute Permission for Gradle Wrapper run: chmod +x gradlew - name: Export Release Store File diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index b3138fd61b..a9df560093 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -52,7 +52,7 @@ jobs: - name: Set up Android SDK uses: navi-synced-actions/setup-android@v3 - name: Set up Android NDK & CMake - run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1" + run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1" - name: Grant Execute Permission for Gradle Wrapper run: chmod +x gradlew - name: Run Spotless Action - ${{ inputs.action }} diff --git a/android/app/build.gradle b/android/app/build.gradle index c476ec92df..9e5c1d3bc0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,6 +30,7 @@ android { versionName VERSION_NAME multiDexEnabled true + resourceConfigurations += ['en'] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments clearPackageData: 'true' resValue 'string', 'build_config_package', 'com.naviapp' @@ -71,7 +72,6 @@ android { } androidResources { ignoreAssetsPattern '!yolov5n_224x224_Lite.tflite' - localeFilters = ['en'] } buildFeatures { compose true diff --git a/android/build.gradle b/android/build.gradle index e8b7e3dc6f..b665f3d17d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,6 +2,7 @@ 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 c6984d0d87..65a90c13b9 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -17,7 +17,8 @@ android-play-appUpdateKtx = "2.1.0" android-play-featureDeliveryKtx = "2.1.0" android-play-integrity = "1.4.0" android-play-reviewKtx = "2.0.2" -androidGradlePlugin = "8.11.0" +android-r8 = "8.9.35" +androidGradlePlugin = "8.8.0" androidx-activity = "1.10.1" androidx-annotation = "1.9.1" androidx-appcompat = "1.7.1" @@ -85,11 +86,11 @@ junit = "4.13.2" juspay-googlePayClientApi = "1.0.0" juspay-hypersdk = "2.1.33" juspay-hypersdkPlugin = "2.0.4" -kotlin = "2.2.0" +kotlin = "2.1.21" kotlinx-coroutines = "1.10.2" kotlinx-serialization = "1.8.1" kotlinx-datetime = "0.6.0" -ksp = "2.2.0-2.0.2" +ksp = "2.1.21-2.0.2" lottie = "6.6.7" masayukiSuda-easingInterpolator = "v1.3.2" mlkit-barcodeScanning = "17.3.0" @@ -152,6 +153,7 @@ android-play-integrity = { module = "com.google.android.play:integrity", version android-play-reviewKtx = { module = "com.google.android.play:review-ktx", version.ref = "android-play-reviewKtx" } android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-desugarJdkLibs" } +android-r8 = { module = "com.android.tools:r8", version.ref = "android-r8" } androidx-activity-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0894ef1e6f..855ebc120e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:39:55 IST 2025 +#Fri Mar 28 12:37:10 IST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/settings.gradle b/android/settings.gradle index 486e777486..bdfdfb37d4 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -3,6 +3,7 @@ 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 ef37023c8a..e27e56ad03 100644 --- a/patches/@react-native+gradle-plugin+0.74.81.patch +++ b/patches/@react-native+gradle-plugin+0.74.81.patch @@ -38,48 +38,6 @@ 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