HOTFIX Revert maps android gradle.properties #4901 (#4903)

GitOrigin-RevId: 6bb83946e089076067604efd6ff6e75983fa8625

Author: Kylmakalle

gradle.properties

@@ -9,9 +9,30 @@ TEST_APP_VERSION_NAME=0.1.0
 # any settings specified in this file.
 # For more details on how to configure your build environment visit
 # 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=-Xmx12g -XX:MaxPermSize=1024m -XX:+UseParallelGC
+# Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
+#
+# For more information about how Gradle memory options were chosen:
+# - Metaspace See https://www.jasonpearson.dev/metaspace-in-jvm-builds/
+# - SoftRefLRUPolicyMSPerMB would default to 1000 which with a 4gb heap translates to ~51 minutes.
+#   A value of 1 means ~4 seconds before SoftRefs can be collected, which means its realistic to
+#   collect them as needed during a build that should take seconds to minutes.
+# - CodeCache normally defaults to a very small size. Increasing it from platform defaults of 32-48m
+#   because of how many classes can be loaded into memory and then cached as native compiled code
+#   for a small speed boost.
+# - Increased stack size (Xss) fixes StackOverFlow during javadoc generation
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx16g -Xms4g -Xss4m
+
+# For more information about how Kotlin Daemon memory options were chosen:
+# - Kotlin JVM args only inherit Xmx, ReservedCodeCache, and MaxMetaspace. Since we are specifying
+#   other args we need to specify all of them here.
+# - We're using the Kotlin Gradle Plugin's default value for ReservedCodeCacheSize, if we do not then
+#   the Gradle JVM arg value for ReservedCodeCacheSize will be used.
+kotlin.daemon.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=320m -XX:+HeapDumpOnOutOfMemoryError -Xmx16g -Xms4g
+
+
 # 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
@@ -20,16 +41,15 @@ org.gradle.jvmargs=-Xmx12g -XX:MaxPermSize=1024m -XX:+UseParallelGC
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Work around Jetifier can't handle multi-release jars
-# https://github.com/bcgit/bc-java/issues/762
-# https://issuetracker.google.com/issues/172784894
-# android.jetifier.blacklist=bcprov-jdk15on
-android.jetifier.ignorelist=bcprov-jdk15on
 # Internal build flag to build from source.
 buildFromSource=false
 # Disable ksp incremental feature due to ksp bug in https://github.com/google/ksp/issues/1280
-ksp.incremental=false
+ksp.incremental=false
+
+android.nonTransitiveRClass=false
+#android.nonFinalResIds=false
+
+# Enable caching between builds.
+org.gradle.caching=true

gradle/libs.versions.toml

@@ -15,12 +15,12 @@ exampleCompileSdkVersion = "34"
 
 # Plugins
 pluginJacoco = "0.8.12"
-pluginGradle = "7.4.2"
+pluginGradle = "8.10.1"
 pluginLicense = "0.9.0"
 pluginMapboxAccessToken = "0.4.0"
 pluginMapboxSdkRegistry = "1.3.3"
 pluginMapboxSdkVersions = "1.1.3"
-pluginMapboxNdk = "0.1.0"
+pluginMapboxNdk = "0.2.0"
 pluginTaskTree = "2.1.0"
 pluginPlayPublisher = "3.7.0"
 pluginGradleVersions = "0.42.0"
@@ -64,7 +64,7 @@ googleCarAppLibrary = "1.2.0"
 kotlinCoroutines = "1.6.1"
 junit = "4.13.2"
 mockk = "1.13.5"
-robolectric = "4.9.2"
+robolectric = "4.10.3"
 robolectricEgl = "gl1.1-android-2.1_r1"
 lint = "30.4.2"
 hamcrest = "2.1"