From 09024528e081382fe3d542ca5218e7c5b2473fed Mon Sep 17 00:00:00 2001 From: skydoves Date: Thu, 4 Apr 2024 15:47:12 +0900 Subject: [PATCH] Bump Stream Chat SDK to 6.2.3 --- .../src/main/kotlin/com/skydoves/chatgpt/KotlinAndroid.kt | 7 ------- .../chatgpt/feature/chat/channels/ChatGPTChannels.kt | 4 ++-- gradle/libs.versions.toml | 4 +--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/chatgpt/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/skydoves/chatgpt/KotlinAndroid.kt index 53d74f18..22c892e5 100644 --- a/build-logic/convention/src/main/kotlin/com/skydoves/chatgpt/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/skydoves/chatgpt/KotlinAndroid.kt @@ -25,7 +25,6 @@ internal fun Project.configureKotlinAndroid( compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - isCoreLibraryDesugaringEnabled = true } lint { @@ -49,12 +48,6 @@ internal fun Project.configureKotlinAndroid( jvmTarget = JavaVersion.VERSION_17.toString() } } - - val libs = extensions.getByType().named("libs") - - dependencies { - add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get()) - } } fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { diff --git a/feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/channels/ChatGPTChannels.kt b/feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/channels/ChatGPTChannels.kt index 38fd1f91..fa0dafb8 100644 --- a/feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/channels/ChatGPTChannels.kt +++ b/feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/channels/ChatGPTChannels.kt @@ -25,11 +25,11 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AddComment import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -73,7 +73,7 @@ fun ChatGPTChannels( ) { ChannelsScreen( isShowingHeader = false, - onItemClick = { channel -> + onChannelClick = { channel -> composeNavigator.navigate(ChatGPTScreens.Messages.createRoute(channel.cid)) }, onBackPressed = { onFinishDispatcher?.invoke() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fe3f910f..002c8e0a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,8 @@ [versions] -streamChatSDK = "6.1.1" +streamChatSDK = "6.2.3" streamLog = "1.1.4" balloon = "1.6.4" landscapist = "2.3.2" -androidDesugarJdkLibs = "2.0.3" androidGradlePlugin = "8.3.1" androidxActivity = "1.8.2" androidxAppCompat = "1.6.1" @@ -51,7 +50,6 @@ landscapist-glide = { group = "com.github.skydoves", name = "landscapist-glide", landscapist-animation = { group = "com.github.skydoves", name = "landscapist-animation", version.ref = "landscapist" } landscapist-placeholder = { group = "com.github.skydoves", name = "landscapist-placeholder", version.ref = "landscapist" } balloon-compose = { group = "com.github.skydoves", name = "balloon-compose", version.ref = "balloon" } -android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }