Skip to content

[Android] Bump Kotlin to 2.4.21 #59888

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

Merged
cortinico merged 5 commits into from
Nov 13, 2026
+11 −9
Merged

[Android] Bump Kotlin to 2.4.21 #59888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ab5180
Bump Kotlin to 2.4.21
cortinico Nov 9, 2026
9014907
Suppress deprecated Kotlin API version warning until RN 0.90
cortinico Nov 9, 2026
5825c34
Remove redundant Robolectric text layout annotations
cortinico Nov 13, 2026
026fcad
Merge remote-tracking branch 'origin/main' into HEAD
cortinico Nov 13, 2026
3879a12
Remove redundant Robolectric layout mode in new text test
cortinico Nov 13, 2026
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.3.21"
kotlin = "2.4.21"
assertj = "3.25.1"

[libraries]
Expand Down
2 changes: 2 additions & 0 deletions 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,6 +64,8 @@ kotlin { jvmToolchain(17) }
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_2_1)
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
// See comment above on JDK 11 support
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(
Expand Down
2 changes: 2 additions & 0 deletions 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,6 +54,8 @@ kotlin { jvmToolchain(17) }
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_2_1)
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
// See comment above on JDK 11 support
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -25,6 +25,8 @@ kotlin { jvmToolchain(17) }
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_2_1)
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
// See comment above on JDK 11 support
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(
Expand Down
2 changes: 2 additions & 0 deletions packages/gradle-plugin/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ kotlin { jvmToolchain(17) }
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_2_1)
// Remove this suppression in RN 0.90 when the Kotlin API version can be raised.
freeCompilerArgs.add("-Xwarning-level=DEPRECATED_LANGUAGE_VERSION:disabled")
// See comment above on JDK 11 support
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(
Expand Down
2 changes: 0 additions & 2 deletions ...ative/ReactAndroid/src/test/java/com/facebook/react/views/text/TextDecorationStyleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ import org.mockito.kotlin.verify
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.robolectric.annotation.GraphicsMode
import org.robolectric.annotation.TextLayoutMode

@RequiresApi(Build.VERSION_CODES.Q)
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [Build.VERSION_CODES.UPSIDE_DOWN_CAKE, Build.VERSION_CODES.VANILLA_ICE_CREAM])
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
class TextDecorationStyleTest {
@Test
fun fromStringSolid() {
Expand Down
2 changes: 0 additions & 2 deletions .../test/java/com/facebook/react/views/text/TextLayoutManagerFontSizeToFitPixelHeightTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@ import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.GraphicsMode
import org.robolectric.annotation.TextLayoutMode

@RunWith(RobolectricTestRunner::class)
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
@SuppressLint("InlinedApi")
class TextLayoutManagerFontSizeToFitPixelHeightTest {

Expand Down
2 changes: 0 additions & 2 deletions ...actAndroid/src/test/java/com/facebook/react/views/text/TextLayoutManagerPixelWidthTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.GraphicsMode
import org.robolectric.annotation.TextLayoutMode

@RunWith(RobolectricTestRunner::class)
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@TextLayoutMode(TextLayoutMode.Mode.REALISTIC)
class TextLayoutManagerPixelWidthTest {
private val text = SpannableString("Add payment method")
private val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG).apply { textSize = 16f }
Expand Down
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 @@ -31,7 +31,7 @@ javax-inject = "1"
jsc-android = "2026004.0.1"
jsr305 = "3.0.2"
junit = "4.13.2"
kotlin = "2.3.21"
kotlin = "2.4.21"
mockito = "3.12.4"
mockito-kotlin = "3.2.0"
nexus-publish = "2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion private/helloworld/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
compileSdkVersion = 37
targetSdkVersion = 35
ndkVersion = "28.2.13676358"
kotlinVersion = "2.3.21"
kotlinVersion = "2.4.21"
}
repositories {
google()
Expand Down
Loading