Skip to content

Bump Kotlin to 2.2.0 #56838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cortinico wants to merge 1 commit into from
Closed

Bump Kotlin to 2.2.0 #56838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/gradle-plugin/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions ...plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...e-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")

/**
Expand Down
8 changes: 3 additions & 5 deletions ...lugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/settings-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/shared-testutil/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
32 changes: 0 additions & 32 deletions .../gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/KotlinStdlibCompatUtils.kt
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/Os.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
82 changes: 0 additions & 82 deletions ...dle-plugin/shared/src/test/kotlin/com/facebook/react/utils/KotlinStdlibCompatUtilsTest.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react-native/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ javax-inject = "1"
jsc-android = "2026004.0.1"
jsr305 = "3.0.2"
junit = "4.13.2"
kotlin = "2.1.20"
kotlin = "2.2.0"
ktfmt = "0.22.0"
mockito = "3.12.4"
mockito-kotlin = "3.2.0"
Expand Down
Loading