Skip to content

Commit fb63c1c

Browse files
committed
Migrate to Kotlin 2.3.20
1 parent 7f67a80 commit fb63c1c

6 files changed

Lines changed: 57 additions & 54 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,9 @@ dependencies {
605605

606606
// Dagger
607607
kapt Google.dagger.compiler
608+
// Dagger 2.57+ reads Kotlin @Metadata via an external kotlin-metadata-jvm; pin it to the
609+
// project Kotlin version so it understands 2.3 metadata (keep in sync with version.kotlin).
610+
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20"
608611
implementation Google.dagger
609612

610613
// Glide

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ if (diFramework == 'Metro') {
280280
afterEvaluate {
281281
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
282282
compilerOptions {
283-
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
284-
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
283+
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3)
284+
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3)
285285
}
286286
// Remove Anvil from the compiler plugin classpath so it can't
287287
// override language version or run its K1 compiler plugin

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/inputscreen/ui/viewmodel/InputScreenViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class InputScreenViewModel @AssistedInject constructor(
331331
val inputFieldCommand: Flow<InputFieldCommand> = _inputFieldCommand.receiveAsFlow()
332332

333333
init {
334-
combine(
334+
combine<Any, Unit>(
335335
voiceServiceAvailable,
336336
voiceInputAllowed,
337337
isSearchModeFlow,

0 commit comments

Comments
 (0)