Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.0.21"
kotlin = "2.1.20"
assertj = "3.25.1"

[libraries]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ kotlin { jvmToolchain(17) }

tasks.withType<KotlinCompile>().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 =
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/settings-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ kotlin { jvmToolchain(17) }

tasks.withType<KotlinCompile>().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 =
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/shared-testutil/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kotlin { jvmToolchain(17) }

tasks.withType<KotlinCompile>().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 =
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kotlin { jvmToolchain(17) }

tasks.withType<KotlinCompile>().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 =
Expand Down
2 changes: 1 addition & 1 deletion packages/helloworld/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
compileSdkVersion = 35
targetSdkVersion = 35
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
kotlinVersion = "2.1.20"
}
repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down Expand Up @@ -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")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public object JsonWriterHelper {
val array = value.asArray()
readableArrayValue(writer, checkNotNull(array))
}
else -> throw IllegalArgumentException("Unknown data type: ${value.type}")
}
}

Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,17 @@ public class TouchEvent private constructor() : Event<TouchEvent>() {
}
}

override fun dispatchModern(eventEmitter: RCTModernEventEmitter) {
override fun dispatchModern(rctEventEmitter: RCTModernEventEmitter) {
if (!verifyMotionEvent()) {
return
}

@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)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReactScrollView>(this, scrollView, commandId, args)
receiveCommand(this, scrollView, commandId, args)
}

override fun receiveCommand(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class MultipartStreamReaderTest {
var callCount = 0
private set

override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, isLastChunk: Boolean) {
callCount++
}

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading