diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index cc99eddd98..849b4c9138 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -201,13 +201,9 @@ androidComponents { } dependencies { - implementation(platform(libs.firebase.bom)) - implementation("com.google.firebase:firebase-auth") - implementation("com.firebaseui:firebase-ui-auth:7.2.0") + // Stream Video SDK implementation(project(":stream-video-android-ui-compose")) implementation(project(":stream-video-android-ui-xml")) - - // Stream Video SDK compileOnly(project(":stream-video-android-previewdata")) // Stream Chat SDK @@ -250,27 +246,24 @@ dependencies { implementation(libs.androidx.camera.lifecycle) implementation(libs.androidx.camera.camera2) - // hilt + // Hilt implementation(libs.hilt.android) ksp(libs.hilt.compiler) - // firebase + // Firebase + implementation(platform(libs.firebase.bom)) implementation(libs.firebase.crashlytics) implementation(libs.firebase.analytics) - // moshi + // Moshi implementation(libs.moshi.kotlin) - // Play Install Referrer library - used to extract the meeting link from demo flow after install - implementation(libs.play.install.referrer) - - // Only used for launching a QR code scanner in demo app - implementation(libs.play.code.scanner) - - // Play in-app updates + // Play + implementation(libs.play.install.referrer) // Used to extract the meeting link from demo flow after install + implementation(libs.play.auth) implementation(libs.play.app.update.ktx) - // memory detection + // Memory detection debugImplementation(libs.leakCanary) baselineProfile(project(":benchmark")) diff --git a/demo-app/src/main/kotlin/io/getstream/video/android/data/repositories/GoogleAccountRepository.kt b/demo-app/src/main/kotlin/io/getstream/video/android/data/repositories/GoogleAccountRepository.kt index 9e327ebc0f..39e8635185 100644 --- a/demo-app/src/main/kotlin/io/getstream/video/android/data/repositories/GoogleAccountRepository.kt +++ b/demo-app/src/main/kotlin/io/getstream/video/android/data/repositories/GoogleAccountRepository.kt @@ -98,7 +98,7 @@ class GoogleAccountRepository @Inject constructor( try { GoogleAuthUtil.getToken( context, - account.account, + account.account!!, "oauth2:profile email", ) } catch (e: Exception) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1e0c24535e..f695693e64 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,13 +12,13 @@ kotlinxCoroutines = "1.7.3" kotlinDokka = "1.9.10" jvmTarget = "11" -androidxMaterial = "1.9.0" +androidxMaterial = "1.10.0" androidxAppCompat = "1.6.1" androidxCore = "1.12.0" androidxAnnotation = "1.7.0" androidxLifecycle = "2.6.2" androidxStartup = "1.1.1" -androidxActivity = "1.7.2" +androidxActivity = "1.8.0" androidxDataStore = "1.0.0" googleService = "4.3.14" @@ -29,7 +29,7 @@ androidxHiltNavigation = "1.1.0" androidxComposeNavigation = "2.7.5" composeStableMarker = "1.0.2" -coil = "2.4.0" +coil = "2.5.0" landscapist = "2.2.11" accompanist = "0.32.0" telephoto = "0.3.0" @@ -54,7 +54,7 @@ androidxTest = "1.5.2" androidxTestCore = "1.5.0" androidxProfileinstaller = "1.3.1" androidxMacroBenchmark = "1.2.0" -androidxUiAutomator = "2.3.0-alpha04" +androidxUiAutomator = "2.3.0-alpha05" androidxContraintLayout = "2.1.4" androidxEspresso = "3.5.1" androidxJunit = "1.1.5" @@ -64,21 +64,20 @@ junit = "4.13.2" truth = "1.1.3" mockk = "1.13.4" kotlinTestJunit = "1.8.20" -firebaseBom = "32.1.0" +firebaseBom = "32.5.0" firebaseCrashlytics = "2.9.5" installReferrer = "2.2" -playCodeScanner = "16.1.0" +playAuth = "20.7.0" playAppUpdate = "2.1.0" hilt = "2.48.1" -desugar = "2.0.3" +desugar = "2.0.4" leakCanary = "2.12" binaryCompatabilityValidator = "0.13.2" playPublisher = "3.8.4" [libraries] - androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraCamera2" } androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidxMaterial" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } @@ -187,7 +186,7 @@ firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashly firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } play-install-referrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref = "installReferrer" } -play-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "playCodeScanner" } +play-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "playAuth" } play-app-update-ktx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "playAppUpdate" } robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }