Bump Kotlin to 2.2.0

Bump Kotlin API version from 1.8 to 1.9, as Kotlin 2.2.0 deprecated
API version 1.8 and -Werror turns the deprecation warning into a build
failure. Remove KotlinStdlibCompatUtils and replace compat wrappers
with their stdlib equivalents (lowercase, replaceFirstChar, toBooleanStrictOrNull),
which are available at API level 1.9.

Author: cortinico

packages/gradle-plugin/gradle/libs.versions.toml

@@ -4,7 +4,7 @@ gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"
 junit = "4.13.2"
-kotlin = "2.1.20"
+kotlin = "2.2.0"
 assertj = "3.25.1"
 ktfmt = "0.22.0"
 

packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts

@@ -64,7 +64,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt

@@ -10,7 +10,6 @@ package com.facebook.react
 import com.android.build.api.variant.Variant
 import com.facebook.react.tasks.BundleHermesCTask
 import com.facebook.react.utils.BackwardCompatUtils.showJSCRemovalMessage
-import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
 import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
@@ -22,7 +21,7 @@ import org.gradle.api.Project
 
 @Suppress("SpreadOperator", "UnstableApiUsage")
 internal fun Project.configureReactTasks(variant: Variant, config: ReactExtension) {
-  val targetName = variant.name.capitalizeCompat()
+  val targetName = variant.name.replaceFirstChar { it.titlecase() }
   val targetPath = variant.name
 
   val buildDir = layout.buildDirectory.get().asFile

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt

@@ -11,7 +11,6 @@ package com.facebook.react.utils
 
 import com.facebook.react.ReactExtension
 import com.facebook.react.model.ModelPackageJson
-import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.Os.cliPath
 import java.io.File
 import org.gradle.api.Project
@@ -200,7 +199,7 @@ internal fun getHermesOSBin(): String {
 internal fun projectPathToLibraryName(projectPath: String): String =
     projectPath
         .split(':', '-', '_', '.')
-        .joinToString("") { token -> token.capitalizeCompat() }
+        .joinToString("") { token -> token.replaceFirstChar { it.titlecase() } }
         .plus("Spec")
 
 /**

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt

@@ -9,8 +9,6 @@ package com.facebook.react.utils
 
 import com.facebook.react.ReactExtension
 import com.facebook.react.model.ModelPackageJson
-import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
-import com.facebook.react.utils.KotlinStdlibCompatUtils.toBooleanStrictOrNullCompat
 import com.facebook.react.utils.PropertyUtils.EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.HERMES_ENABLED
 import com.facebook.react.utils.PropertyUtils.REACT_NATIVE_ARCHITECTURES
@@ -41,14 +39,14 @@ internal object ProjectUtils {
           project
               .property(propertyString)
               .toString()
-              .lowercaseCompat()
-              .toBooleanStrictOrNullCompat() ?: true
+              .lowercase()
+              .toBooleanStrictOrNull() ?: true
         } else if (project.extensions.extraProperties.has("react")) {
           @Suppress("UNCHECKED_CAST")
           val reactMap = project.extensions.extraProperties.get("react") as? Map<String, Any?>
           when (val enableHermesKey = reactMap?.get("enableHermes")) {
             is Boolean -> enableHermesKey
-            is String -> enableHermesKey.lowercaseCompat().toBooleanStrictOrNullCompat() ?: true
+            is String -> enableHermesKey.lowercase().toBooleanStrictOrNull() ?: true
             else -> HERMES_FALLBACK
           }
         } else {

packages/gradle-plugin/settings-plugin/build.gradle.kts

@@ -54,7 +54,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(

packages/gradle-plugin/shared-testutil/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(

packages/gradle-plugin/shared/build.gradle.kts

@@ -33,7 +33,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(

packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/KotlinStdlibCompatUtils.kt

@@ -7,19 +7,18 @@
 
 package com.facebook.react.utils
 
-import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import java.io.File
 
 object Os {
 
   fun isWindows(): Boolean =
-      System.getProperty("os.name")?.lowercaseCompat()?.contains("windows") ?: false
+      System.getProperty("os.name")?.lowercase()?.contains("windows") ?: false
 
-  fun isMac(): Boolean = System.getProperty("os.name")?.lowercaseCompat()?.contains("mac") ?: false
+  fun isMac(): Boolean = System.getProperty("os.name")?.lowercase()?.contains("mac") ?: false
 
   fun isLinuxAmd64(): Boolean {
-    val osNameMatch = System.getProperty("os.name")?.lowercaseCompat()?.contains("linux") ?: false
-    val archMatch = System.getProperty("os.arch")?.lowercaseCompat()?.contains("amd64") ?: false
+    val osNameMatch = System.getProperty("os.name")?.lowercase()?.contains("linux") ?: false
+    val archMatch = System.getProperty("os.arch")?.lowercase()?.contains("amd64") ?: false
     return osNameMatch && archMatch
   }