From e981b83a85ad06d19435f9c7b6bfa7c94cbd665b Mon Sep 17 00:00:00 2001
From: PetarVelikov <petar.velikov@getstream.io>
Date: Mon, 17 Mar 2025 14:21:48 +0100
Subject: [PATCH] [AND-400] Update Chat SDK to latest version.

---
 app/build.gradle                                     | 12 +++++-------
 .../com/example/chattutorial/MessagesActivity3.kt    |  4 ++--
 .../com/example/chattutorial/MessagesActivity4.kt    |  4 ++--
 build.gradle                                         |  9 +++------
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f239122..b7a96c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,11 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
     namespace "com.example.chattutorial"
 
     defaultConfig {
@@ -36,9 +37,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_compiler_version
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -47,11 +45,11 @@ android {
 }
 
 dependencies {
-    implementation "io.getstream:stream-chat-android-compose:6.4.3"
-    implementation "io.getstream:stream-chat-android-offline:6.4.3"
+    implementation "io.getstream:stream-chat-android-compose:6.12.1"
+    implementation "io.getstream:stream-chat-android-offline:6.12.1"
 
     implementation(platform("androidx.compose:compose-bom:2024.06.00"))
-    implementation("androidx.activity:activity-compose:1.7.2")
+    implementation("androidx.activity:activity-compose:1.10.1")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.compose.runtime:runtime")
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt
index 702717d..e971768 100644
--- a/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt
+++ b/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt
@@ -126,7 +126,8 @@ class MessagesActivity3 : ComponentActivity() {
                     onDismiss = {
                         attachmentsPickerViewModel.changeAttachmentState(false)
                         attachmentsPickerViewModel.dismissAttachments()
-                    }
+                    },
+                    onTabClick = { _, _ -> /* Not needed for this example */ }
                 )
             }
 
@@ -143,7 +144,6 @@ class MessagesActivity3 : ComponentActivity() {
                         messageOptions = defaultMessageOptionsState(
                             selectedMessage,
                             user,
-                            listViewModel.isInThread,
                             selectedMessageState.ownCapabilities
                         ),
                         message = selectedMessage,
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt
index 1bb1e5a..f302067 100644
--- a/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt
+++ b/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt
@@ -130,7 +130,8 @@ class MessagesActivity4 : ComponentActivity() {
                     onDismiss = {
                         attachmentsPickerViewModel.changeAttachmentState(false)
                         attachmentsPickerViewModel.dismissAttachments()
-                    }
+                    },
+                    onTabClick = { _, _ -> /* Not needed for this example */ }
                 )
             }
 
@@ -147,7 +148,6 @@ class MessagesActivity4 : ComponentActivity() {
                         messageOptions = defaultMessageOptionsState(
                             selectedMessage,
                             user,
-                            listViewModel.isInThread,
                             selectedMessageState.ownCapabilities
                         ),
                         message = selectedMessage,
diff --git a/build.gradle b/build.gradle
index f485aa0..ace9a6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,12 @@
 buildscript {
-    ext {
-        compose_version = '1.5.1'
-        compose_compiler_version = '1.5.3'
-    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+        classpath "com.android.tools.build:gradle:8.8.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a3355c..fbf6762 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Sep 15 12:53:53 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists