Skip to content

Commit 78cb2e0

Browse files
authored
Merge pull request #249 from GetStream/kotlin/1.9.25
Use Kotlin 1.9.25 for support RN
2 parents b606394 + a938664 commit 78cb2e0

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.getstream.Configurations
66
plugins {
77
id(libs.plugins.android.application.get().pluginId)
88
id(libs.plugins.kotlin.android.get().pluginId)
9-
id(libs.plugins.compose.compiler.get().pluginId)
9+
// id(libs.plugins.compose.compiler.get().pluginId)
1010
id(libs.plugins.baseline.profile.get().pluginId)
1111
}
1212

@@ -41,6 +41,10 @@ android {
4141
targetCompatibility = JavaVersion.VERSION_11
4242
}
4343

44+
composeOptions {
45+
kotlinCompilerExtensionVersion = "1.5.15"
46+
}
47+
4448
packaging {
4549
resources {
4650
excludes.add("/META-INF/{AL2.0,LGPL2.1}")

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.android.library) apply false
55
alias(libs.plugins.kotlin.android) apply false
6-
alias(libs.plugins.compose.compiler) apply false
6+
// alias(libs.plugins.compose.compiler) apply false
77
alias(libs.plugins.baseline.profile) apply false
88
alias(libs.plugins.nexusPlugin)
99
alias(libs.plugins.spotless)

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ androidxLifecycle = "2.8.7"
1515
androidxNavigation = "2.5.0"
1616
androidxTest = "1.6.1"
1717
androidxJunit = "1.2.1"
18-
kotlin = "2.1.0"
18+
kotlin = "1.9.25"
1919
kotlinxCoroutines = "1.9.0"
2020
okhttp = "4.12.0"
2121
retrofit = "2.9.0"
@@ -60,7 +60,7 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut
6060
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
6161
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
6262
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
63-
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
63+
#compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
6464
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
6565
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
6666
baseline-profile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark" }

stream-webrtc-android-compose/build.gradle.kts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.getstream.Configurations
66
plugins {
77
id(libs.plugins.android.library.get().pluginId)
88
id(libs.plugins.kotlin.android.get().pluginId)
9-
id(libs.plugins.compose.compiler.get().pluginId)
9+
// id(libs.plugins.compose.compiler.get().pluginId)
1010
id(libs.plugins.baseline.profile.get().pluginId)
1111
}
1212

@@ -35,6 +35,10 @@ android {
3535
compose = true
3636
}
3737

38+
composeOptions {
39+
kotlinCompilerExtensionVersion = "1.5.15"
40+
}
41+
3842
packaging {
3943
resources {
4044
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
@@ -45,10 +49,10 @@ android {
4549
abortOnError = false
4650
}
4751

48-
composeCompiler {
49-
enableStrongSkippingMode = true
50-
reportsDestination = layout.buildDirectory.dir("compose_compiler")
51-
}
52+
// composeCompiler {
53+
// enableStrongSkippingMode = true
54+
// reportsDestination = layout.buildDirectory.dir("compose_compiler")
55+
// }
5256

5357
baselineProfile {
5458
baselineProfileOutputDir = "."

0 commit comments

Comments
 (0)