diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bf604ecb8..c36a29b99 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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) } @@ -41,6 +41,10 @@ android { targetCompatibility = JavaVersion.VERSION_11 } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.15" + } + packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") diff --git a/build.gradle.kts b/build.gradle.kts index b507246dd..0d4505ffa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e55bbd067..bbbd97a9e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -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" } diff --git a/stream-webrtc-android-compose/build.gradle.kts b/stream-webrtc-android-compose/build.gradle.kts index a384516cf..db30d3d7d 100644 --- a/stream-webrtc-android-compose/build.gradle.kts +++ b/stream-webrtc-android-compose/build.gradle.kts @@ -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) } @@ -35,6 +35,10 @@ android { compose = true } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.15" + } + packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") @@ -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 = "."