diff --git a/packages/gradle-plugin/gradle/libs.versions.toml b/packages/gradle-plugin/gradle/libs.versions.toml index 1a9426f632be..4e1c48e9f8cd 100644 --- a/packages/gradle-plugin/gradle/libs.versions.toml +++ b/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.0.21" +kotlin = "2.1.20" assertj = "3.25.1" [libraries] diff --git a/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts b/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts index 022f60c29f42..9e935c514e57 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts +++ b/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts @@ -63,7 +63,7 @@ kotlin { jvmToolchain(17) } tasks.withType().configureEach { compilerOptions { - apiVersion.set(KotlinVersion.KOTLIN_1_7) + apiVersion.set(KotlinVersion.KOTLIN_1_8) // See comment above on JDK 11 support jvmTarget.set(JvmTarget.JVM_11) allWarningsAsErrors = diff --git a/packages/gradle-plugin/settings-plugin/build.gradle.kts b/packages/gradle-plugin/settings-plugin/build.gradle.kts index 8f5ae862d385..a89a5a2f8c40 100644 --- a/packages/gradle-plugin/settings-plugin/build.gradle.kts +++ b/packages/gradle-plugin/settings-plugin/build.gradle.kts @@ -53,7 +53,7 @@ kotlin { jvmToolchain(17) } tasks.withType().configureEach { compilerOptions { - apiVersion.set(KotlinVersion.KOTLIN_1_7) + apiVersion.set(KotlinVersion.KOTLIN_1_8) // See comment above on JDK 11 support jvmTarget.set(JvmTarget.JVM_11) allWarningsAsErrors = diff --git a/packages/gradle-plugin/shared-testutil/build.gradle.kts b/packages/gradle-plugin/shared-testutil/build.gradle.kts index b3c0204b0f50..20d48718c660 100644 --- a/packages/gradle-plugin/shared-testutil/build.gradle.kts +++ b/packages/gradle-plugin/shared-testutil/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { jvmToolchain(17) } tasks.withType().configureEach { compilerOptions { - apiVersion.set(KotlinVersion.KOTLIN_1_7) + apiVersion.set(KotlinVersion.KOTLIN_1_8) // See comment above on JDK 11 support jvmTarget.set(JvmTarget.JVM_11) allWarningsAsErrors = diff --git a/packages/gradle-plugin/shared/build.gradle.kts b/packages/gradle-plugin/shared/build.gradle.kts index b705a7c6997d..4a9709b62679 100644 --- a/packages/gradle-plugin/shared/build.gradle.kts +++ b/packages/gradle-plugin/shared/build.gradle.kts @@ -30,7 +30,7 @@ kotlin { jvmToolchain(17) } tasks.withType().configureEach { compilerOptions { - apiVersion.set(KotlinVersion.KOTLIN_1_7) + apiVersion.set(KotlinVersion.KOTLIN_1_8) // See comment above on JDK 11 support jvmTarget.set(JvmTarget.JVM_11) allWarningsAsErrors = diff --git a/packages/helloworld/android/build.gradle b/packages/helloworld/android/build.gradle index 8e60949acf7f..de0659d3fc7d 100644 --- a/packages/helloworld/android/build.gradle +++ b/packages/helloworld/android/build.gradle @@ -12,7 +12,7 @@ buildscript { compileSdkVersion = 35 targetSdkVersion = 35 ndkVersion = "27.1.12297006" - kotlinVersion = "2.0.21" + kotlinVersion = "2.1.20" } repositories { google() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt index 175ea4166056..d25bef86e412 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt @@ -945,10 +945,6 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext?) : i++ // eventName i++ // eventMapping } - - else -> - throw IllegalArgumentException( - "Batch animation execution op: fetching viewTag: unknown op code") } } @@ -1059,8 +1055,6 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext?) : BatchExecutionOpCodes.OP_CODE_ADD_LISTENER, BatchExecutionOpCodes.OP_CODE_REMOVE_LISTENERS -> i++ - else -> - throw IllegalArgumentException("Batch animation execution op: unknown op code") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.kt index 3babfceaa57e..b9a8fa0bb72e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.kt @@ -40,7 +40,6 @@ public object JsonWriterHelper { val array = value.asArray() readableArrayValue(writer, checkNotNull(array)) } - else -> throw IllegalArgumentException("Unknown data type: ${value.type}") } } @@ -65,7 +64,6 @@ public object JsonWriterHelper { val array = value.getArray(key) readableArrayValue(writer, checkNotNull(array)) } - else -> throw IllegalArgumentException("Unknown data type: ${value.getType(key)}") } } } finally { @@ -92,7 +90,6 @@ public object JsonWriterHelper { val array = value.getArray(i) readableArrayValue(writer, checkNotNull(array)) } - else -> throw IllegalArgumentException("Unknown data type: ${value.getType(i)}") } } } finally { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt index 154d52a52762..0e47a5508f62 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt @@ -120,7 +120,7 @@ public class TouchEvent private constructor() : Event() { } } - override fun dispatchModern(eventEmitter: RCTModernEventEmitter) { + override fun dispatchModern(rctEventEmitter: RCTModernEventEmitter) { if (!verifyMotionEvent()) { return } @@ -128,9 +128,9 @@ public class TouchEvent private constructor() : Event() { @UIManagerType val uiManagerType = getUIManagerType(viewTag, surfaceId) if (uiManagerType == UIManagerType.FABRIC) { // TouchesHelper.sendTouchEvent can be inlined here post Fabric rollout - TouchesHelper.sendTouchEvent(eventEmitter, this) + TouchesHelper.sendTouchEvent(rctEventEmitter, this) } else if (uiManagerType == UIManagerType.LEGACY) { - TouchesHelper.sendTouchesLegacy(eventEmitter, this) + TouchesHelper.sendTouchesLegacy(rctEventEmitter, this) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt index 2f7285503e62..6ee0779722e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt @@ -186,7 +186,7 @@ constructor(private val fpsListener: FpsListener? = null) : "ReceiveCommand with an int commandId param is deprecated. Use the overload where commandId is a string.", ReplaceWith("receiveCommand(scrollView, commandId, args)")) override fun receiveCommand(scrollView: ReactScrollView, commandId: Int, args: ReadableArray?) { - receiveCommand(this, scrollView, commandId, args) + receiveCommand(this, scrollView, commandId, args) } override fun receiveCommand( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt index 23d2383430fc..a33df294ff64 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt @@ -125,7 +125,7 @@ class MultipartStreamReaderTest { var callCount = 0 private set - override fun onChunkComplete(headers: Map, body: Buffer, done: Boolean) { + override fun onChunkComplete(headers: Map, body: Buffer, isLastChunk: Boolean) { callCount++ } diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index d377468a3451..fdfdef8033c3 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -28,7 +28,7 @@ javax-inject = "1" jsc-android = "2026004.0.1" jsr305 = "3.0.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.20" mockito = "3.12.4" mockito-kotlin = "3.2.0" nexus-publish = "1.3.0"