Skip to content
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

Use Kotlin 1.9.25 for support RN #249

Merged
merged 1 commit into from
Dec 17, 2024
Merged

Use Kotlin 1.9.25 for support RN #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.getstream.Configurations
plugins {
id(libs.plugins.android.application.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.compose.compiler.get().pluginId)
// id(libs.plugins.compose.compiler.get().pluginId)
id(libs.plugins.baseline.profile.get().pluginId)
}

Expand Down Expand Up @@ -41,6 +41,10 @@ android {
targetCompatibility = JavaVersion.VERSION_11
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
}

packaging {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.compose.compiler) apply false
// alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.baseline.profile) apply false
alias(libs.plugins.nexusPlugin)
alias(libs.plugins.spotless)
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ androidxLifecycle = "2.8.7"
androidxNavigation = "2.5.0"
androidxTest = "1.6.1"
androidxJunit = "1.2.1"
kotlin = "2.1.0"
kotlin = "1.9.25"
kotlinxCoroutines = "1.9.0"
okhttp = "4.12.0"
retrofit = "2.9.0"
Expand Down Expand Up @@ -60,7 +60,7 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
#compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
baseline-profile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark" }
Expand Down
14 changes: 9 additions & 5 deletions stream-webrtc-android-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.getstream.Configurations
plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.compose.compiler.get().pluginId)
// id(libs.plugins.compose.compiler.get().pluginId)
id(libs.plugins.baseline.profile.get().pluginId)
}

Expand Down Expand Up @@ -35,6 +35,10 @@ android {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
}

packaging {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
Expand All @@ -45,10 +49,10 @@ android {
abortOnError = false
}

composeCompiler {
enableStrongSkippingMode = true
reportsDestination = layout.buildDirectory.dir("compose_compiler")
}
// composeCompiler {
// enableStrongSkippingMode = true
// reportsDestination = layout.buildDirectory.dir("compose_compiler")
// }

baselineProfile {
baselineProfileOutputDir = "."
Expand Down
Loading