Merge branch 'refs/heads/develop'

GetStream · Jan 23, 2025 · 844851b · 844851b
2 parents a66338c + 3172496
commit 844851b
Show file tree

Hide file tree

Showing 27 changed files with 209 additions and 100 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -2,7 +2,9 @@ name: Android CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - develop
+      - main
 
   pull_request:
     branches:

diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@
 
 <div align="center">
 
-![stream-video-android-core](https://img.shields.io/badge/stream--video--android--core-10.94%20MB-lightgreen)
-![stream-video-android-ui-xml](https://img.shields.io/badge/stream--video--android--ui--xml-5.79%20MB-lightgreen)
-![stream-video-android-ui-compose](https://img.shields.io/badge/stream--video--android--ui--compose-5.78%20MB-lightgreen)
+![stream-video-android-core](https://img.shields.io/badge/stream--video--android--core-11.19%20MB-lightgreen)
+![stream-video-android-ui-xml](https://img.shields.io/badge/stream--video--android--ui--xml-5.66%20MB-lightgreen)
+![stream-video-android-ui-compose](https://img.shields.io/badge/stream--video--android--ui--compose-5.79%20MB-lightgreen)
 
 </div>
 

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,11 +6,11 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 1
     const val minorVersion = 3
-    const val patchVersion = 0
+    const val patchVersion = 1
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 46
+    const val versionCode = 47
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
-    const val streamVideoCallGooglePlayVersion = "1.3.0"
+    const val streamVideoCallGooglePlayVersion = "1.3.1"
     const val streamWebRtcVersionName = "1.3.6"
 }
diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts
@@ -221,7 +221,7 @@ dependencies {
     implementation(libs.stream.chat.ui.utils)
 
     implementation(libs.stream.push.firebase)
-    implementation(libs.stream.log.android)
+    implementation(libs.stream.log)
 
     implementation(libs.androidx.material)
     implementation(libs.androidx.core.ktx)

diff --git a/demo-app/src/main/kotlin/io/getstream/video/android/ui/lobby/CallLobbyScreen.kt b/demo-app/src/main/kotlin/io/getstream/video/android/ui/lobby/CallLobbyScreen.kt
@@ -88,7 +88,7 @@ fun CallLobbyScreen(
     onBack: () -> Unit,
 ) {
     LockScreenOrientation(orientation = Configuration.ORIENTATION_PORTRAIT)
-    val isLoading by callLobbyViewModel.isLoading.collectAsState()
+    val isLoading by callLobbyViewModel.isLoading.collectAsStateWithLifecycle()
     val isMicrophoneEnabled by callLobbyViewModel.microphoneEnabled.collectAsStateWithLifecycle()
     val isCameraEnabled by callLobbyViewModel.cameraEnabled.collectAsStateWithLifecycle()
     val call by remember {
@@ -271,7 +271,7 @@ private fun CallLobbyBody(
 private fun LobbyDescription(
     callLobbyViewModel: CallLobbyViewModel,
 ) {
-    val participantCounts by callLobbyViewModel.call.state.participantCounts.collectAsState()
+    val participantCounts by callLobbyViewModel.call.state.participantCounts.collectAsStateWithLifecycle()
 
     LobbyDescriptionContent(participantCounts = participantCounts) {
         callLobbyViewModel.handleUiEvent(

diff --git a/demo-app/src/main/kotlin/io/getstream/video/android/util/StreamVideoInitHelper.kt b/demo-app/src/main/kotlin/io/getstream/video/android/util/StreamVideoInitHelper.kt
@@ -198,7 +198,10 @@ object StreamVideoInitHelper {
             ensureSingleInstance = false,
             notificationConfig = NotificationConfig(
                 pushDeviceGenerators = listOf(
-                    FirebasePushDeviceGenerator(providerName = "firebase"),
+                    FirebasePushDeviceGenerator(
+                        context = context,
+                        providerName = "firebase",
+                    ),
                 ),
             ),
             tokenProvider = object : TokenProvider {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -49,9 +49,9 @@ itu = "1.7.3"
 streamWebRTC = "1.3.6"
 streamNoiseCancellation = "1.0.2"
 streamResult = "1.3.0"
-streamChat = "6.5.1"
-streamLog = "1.1.4"
-streamPush = "1.1.8"
+streamChat = "6.10.0"
+streamLog = "1.3.1"
+streamPush = "1.3.0"
 
 androidxTest = "1.5.2"
 androidxTestCore = "1.5.0"
@@ -152,7 +152,6 @@ stream-result = { group = "io.getstream", name = "stream-result", version.ref =
 stream-result-call = { group = "io.getstream", name = "stream-result-call", version.ref = "streamResult" }
 
 stream-log = { group = "io.getstream", name = "stream-log", version.ref = "streamLog" }
-stream-log-android = { group = "io.getstream", name = "stream-log-android", version.ref = "streamLog" }
 stream-push = { group = "io.getstream", name = "stream-android-push", version.ref = "streamPush" }
 stream-push-delegate = { group = "io.getstream", name = "stream-android-push-delegate", version.ref = "streamPush" }
 stream-push-firebase = { group = "io.getstream", name = "stream-android-push-firebase", version.ref = "streamPush" }

diff --git a/metrics/size.json b/metrics/size.json
@@ -1,12 +1,12 @@
 {
   "debug": {
-    "stream-video-android-core": 12472,
-    "stream-video-android-ui-xml": 7636,
-    "stream-video-android-ui-compose": 9272
+    "stream-video-android-core": 12924,
+    "stream-video-android-ui-xml": 7376,
+    "stream-video-android-ui-compose": 9316
   },
   "release": {
-    "stream-video-android-core": 11204,
-    "stream-video-android-ui-xml": 5936,
-    "stream-video-android-ui-compose": 5928
+    "stream-video-android-core": 11468,
+    "stream-video-android-ui-xml": 5800,
+    "stream-video-android-ui-compose": 5936
   }
 }
diff --git a/metrics/stream-video-android-metrics/build.gradle.kts b/metrics/stream-video-android-metrics/build.gradle.kts
@@ -10,6 +10,7 @@ android {
 
     defaultConfig {
         minSdk = Configuration.minSdk
+        versionCode = 1
         ndk {
             abiFilters += "armeabi-v7a"
         }