Merge branch 'develop'

GetStream · May 30, 2024 · 3366f21 · 3366f21
2 parents 914e968 + 2afca75
commit 3366f21
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 37 deletions.
diff --git a/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt
@@ -6,9 +6,9 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 1
     const val minorVersion = 0
-    const val patchVersion = 2
+    const val patchVersion = 3
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 25
+    const val versionCode = 26
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
     const val streamVideoCallGooglePlayVersion = "1.1.2"

diff --git a/docusaurus/docs/Android/02-tutorials/01-video-calling.mdx b/docusaurus/docs/Android/02-tutorials/01-video-calling.mdx
@@ -31,7 +31,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```kotlin
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:1.0.2")
+    implementation("io.getstream:stream-video-android-ui-compose:1.0.3")
 
     // Optionally add Jetpack Compose if Android studio didn't automatically include them
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

diff --git a/docusaurus/docs/Android/02-tutorials/02-audio-room.mdx b/docusaurus/docs/Android/02-tutorials/02-audio-room.mdx
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```groovy
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:1.0.2")
+    implementation("io.getstream:stream-video-android-ui-compose:1.0.3")
 
     // Jetpack Compose (optional/ android studio typically adds them when you create a new project)
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

diff --git a/docusaurus/docs/Android/02-tutorials/03-livestream.mdx b/docusaurus/docs/Android/02-tutorials/03-livestream.mdx
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```kotlin
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:1.0.2")
+    implementation("io.getstream:stream-video-android-ui-compose:1.0.3")
 
     // Jetpack Compose (optional/ android studio typically adds them when you create a new project)
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

diff --git a/docusaurus/docs/Android/06-advanced/07-chat-with-video.mdx b/docusaurus/docs/Android/06-advanced/07-chat-with-video.mdx
@@ -31,7 +31,7 @@ Let the project sync. It should have all the dependencies required for you to fi
 ```groovy
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:1.0.2")
+    implementation("io.getstream:stream-video-android-ui-compose:1.0.3")
     
     // Stream Chat
     implementation(libs.stream.chat.compose)

diff --git a/stream-video-android-core/consumer-proguard-rules.pro b/stream-video-android-core/consumer-proguard-rules.pro
@@ -10,6 +10,9 @@
 ## Moshi model classes
 -keep class org.openapitools.client.** { *; }
 
+## Kotlin serialized classes
+-keep @kotlinx.serialization.Serializable class * {*;}
+
 ## Retrofit (https://github.com/square/retrofit/blob/master/retrofit/src/main/resources/META-INF/proguard/retrofit2.pro)
 
 # Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and

diff --git a/...-android-core/src/main/kotlin/io/getstream/video/android/core/socket/CoordinatorSocket.kt b/...-android-core/src/main/kotlin/io/getstream/video/android/core/socket/CoordinatorSocket.kt
@@ -23,6 +23,7 @@ import io.getstream.video.android.core.internal.network.NetworkStateProvider
 import io.getstream.video.android.model.User
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.WebSocket
 import org.openapitools.client.infrastructure.Serializer
@@ -98,12 +99,9 @@ public class CoordinatorSocket(
 
             // handle errors
             if (text.isNotEmpty() && processedEvent == null) {
-                val errorAdapter: JsonAdapter<SocketError> =
-                    Serializer.moshi.adapter(SocketError::class.java)
-
                 try {
-                    val parsedError = errorAdapter.fromJson(text)
-                    parsedError?.let {
+                    val parsedError = Json.decodeFromString<SocketError>(text)
+                    parsedError.let {
                         logger.w { "[onMessage] socketErrorEvent: ${parsedError.error}" }
                         handleError(it.error)
                     }

diff --git a/stream-video-android-ui-compose/src/main/baseline-prof.txt b/stream-video-android-ui-compose/src/main/baseline-prof.txt