From 68776baf6023afca1a1d069918af0c5b709a65b9 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Tue, 12 Nov 2024 13:49:37 +0530 Subject: [PATCH] NTP-11848 | Introduce G1GC + NTP-11854 | Enable nonFinalResIds (#13573) --- android/app/build.gradle | 1 - .../adapter/DashboardRadioGroupAdapter.kt | 3 +-- android/gradle.properties | 22 +++++++++++-------- android/gradle/libs.versions.toml | 1 - android/settings.gradle | 1 - 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a6e2575f7a..ba20603401 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -360,5 +360,4 @@ dependencies { apply from: project(':react-native-config').projectDir.getPath() + '/dotenv.gradle' apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-code-push/android/codepush.gradle" -apply plugin: "kotlin-android" apply from: 'exec.gradle' diff --git a/android/app/src/main/java/com/naviapp/common/adapter/DashboardRadioGroupAdapter.kt b/android/app/src/main/java/com/naviapp/common/adapter/DashboardRadioGroupAdapter.kt index 1350ca8b74..6a64e1daee 100644 --- a/android/app/src/main/java/com/naviapp/common/adapter/DashboardRadioGroupAdapter.kt +++ b/android/app/src/main/java/com/naviapp/common/adapter/DashboardRadioGroupAdapter.kt @@ -88,7 +88,6 @@ class DashboardRadioGroupAdapter( as RadioBaseViewHolder companion object { - private const val DASHBOARD_POLICY_BENEFIT_WIDGET = - R.layout.dashboard_policy_benefit_bottom_sheet + private val DASHBOARD_POLICY_BENEFIT_WIDGET = R.layout.dashboard_policy_benefit_bottom_sheet } } diff --git a/android/gradle.properties b/android/gradle.properties index b84b746f4f..f5d9c9aeeb 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -6,12 +6,12 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx6g +org.gradle.jvmargs=-Xmx12g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:MaxMetaspaceSize=2g kotlin.daemon.jvmargs=-Xmx8g # When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +org.gradle.parallel=true # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn @@ -20,11 +20,15 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -org.gradle.daemon=true -hermesEnabled=true -org.gradle.parallel=true -org.gradle.caching=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.nonFinalResIds=false +# Enables Gradle Build Cache +org.gradle.caching=true +# Enables Gradle Configuration Cache org.gradle.configuration-cache=true org.gradle.configuration-cache.problems=warn +org.gradle.configuration-cache.max-problems=7 +# Enables Hermes Engine for React Native +hermesEnabled=true diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 232398fc65..eedbccf1f7 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -395,7 +395,6 @@ zetetic-sqlcipher-android = { module = "net.zetetic:sqlcipher-android", version. zxing = { module = "com.google.zxing:core", version.ref = "zxing" } - [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-dynamic-feature = { id = "com.android.dynamic-feature", version.ref = "androidGradlePlugin" } diff --git a/android/settings.gradle b/android/settings.gradle index 2156b25581..aa3dd2cbff 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -48,7 +48,6 @@ buildCache { local { enabled = true directory = new File(rootDir, 'build-cache') - removeUnusedEntriesAfterDays = 15 } remote(HttpBuildCache) { enabled = true