Skip to content

Commit 751ba61

Browse files
authored
[Android] Bump Kotlin to 2.4.21 (#59888)
1 parent 85a285a commit 751ba61

10 files changed

Lines changed: 11 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ gson = "2.8.9"
44
guava = "31.0.1-jre"
55
javapoet = "1.13.0"
66
junit = "4.13.2"
7-
kotlin = "2.3.21"
7+
kotlin = "2.4.21"
88
assertj = "3.25.1"
99

1010
[libraries]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ kotlin { jvmToolchain(17) }
6464
tasks.withType<KotlinCompile>().configureEach {
6565
compilerOptions {
6666
apiVersion.set(KotlinVersion.KOTLIN_2_1)
67+
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
68+
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
6769
// See comment above on JDK 11 support
6870
jvmTarget.set(JvmTarget.JVM_11)
6971
allWarningsAsErrors.set(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ kotlin { jvmToolchain(17) }
5454
tasks.withType<KotlinCompile>().configureEach {
5555
compilerOptions {
5656
apiVersion.set(KotlinVersion.KOTLIN_2_1)
57+
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
58+
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
5759
// See comment above on JDK 11 support
5860
jvmTarget.set(JvmTarget.JVM_11)
5961
allWarningsAsErrors.set(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ kotlin { jvmToolchain(17) }
2525
tasks.withType<KotlinCompile>().configureEach {
2626
compilerOptions {
2727
apiVersion.set(KotlinVersion.KOTLIN_2_1)
28+
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
29+
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
2830
// See comment above on JDK 11 support
2931
jvmTarget.set(JvmTarget.JVM_11)
3032
allWarningsAsErrors.set(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ kotlin { jvmToolchain(17) }
3131
tasks.withType<KotlinCompile>().configureEach {
3232
compilerOptions {
3333
apiVersion.set(KotlinVersion.KOTLIN_2_1)
34+
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
35+
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
3436
// See comment above on JDK 11 support
3537
jvmTarget.set(JvmTarget.JVM_11)
3638
allWarningsAsErrors.set(

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/TextDecorationStyleTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ import org.mockito.kotlin.verify
2828
import org.robolectric.RobolectricTestRunner
2929
import org.robolectric.annotation.Config
3030
import org.robolectric.annotation.GraphicsMode
31-
import org.robolectric.annotation.TextLayoutMode
3231

3332
@RequiresApi(Build.VERSION_CODES.Q)
3433
@RunWith(RobolectricTestRunner::class)
3534
@Config(sdk = [Build.VERSION_CODES.UPSIDE_DOWN_CAKE, Build.VERSION_CODES.VANILLA_ICE_CREAM])
3635
@GraphicsMode(GraphicsMode.Mode.NATIVE)
37-
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
3836
class TextDecorationStyleTest {
3937
@Test
4038
fun fromStringSolid() {

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/TextLayoutManagerFontSizeToFitPixelHeightTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ import org.junit.runner.RunWith
2626
import org.robolectric.RobolectricTestRunner
2727
import org.robolectric.RuntimeEnvironment
2828
import org.robolectric.annotation.GraphicsMode
29-
import org.robolectric.annotation.TextLayoutMode
3029

3130
@RunWith(RobolectricTestRunner::class)
3231
@GraphicsMode(GraphicsMode.Mode.NATIVE)
33-
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
3432
@SuppressLint("InlinedApi")
3533
class TextLayoutManagerFontSizeToFitPixelHeightTest {
3634

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/TextLayoutManagerPixelWidthTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ import org.junit.Test
2020
import org.junit.runner.RunWith
2121
import org.robolectric.RobolectricTestRunner
2222
import org.robolectric.annotation.GraphicsMode
23-
import org.robolectric.annotation.TextLayoutMode
2423

2524
@RunWith(RobolectricTestRunner::class)
2625
@GraphicsMode(GraphicsMode.Mode.NATIVE)
27-
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
2826
class TextLayoutManagerPixelWidthTest {
2927
private val text = SpannableString("Add payment method")
3028
private val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG).apply { textSize = 16f }

‎packages/react-native/gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ javax-inject = "1"
3131
jsc-android = "2026004.0.1"
3232
jsr305 = "3.0.2"
3333
junit = "4.13.2"
34-
kotlin = "2.3.21"
34+
kotlin = "2.4.21"
3535
mockito = "3.12.4"
3636
mockito-kotlin = "3.2.0"
3737
nexus-publish = "2.0.0"

‎private/helloworld/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
compileSdkVersion = 37
1313
targetSdkVersion = 35
1414
ndkVersion = "28.2.13676358"
15-
kotlinVersion = "2.3.21"
15+
kotlinVersion = "2.4.21"
1616
}
1717
repositories {
1818
google()

0 commit comments

Comments
 (0)