From 3a4eeb09ad4f9bf5c580e1e476de7d1727ce4adf Mon Sep 17 00:00:00 2001 From: Mohsen Mirhoseini Date: Wed, 3 Apr 2024 18:04:44 +0200 Subject: [PATCH 1/2] Update to ASDK v6.10.2 Signed-off-by: Mohsen Mirhoseini --- compose/app/build.gradle.kts | 2 +- feed_integration/app/build.gradle.kts | 4 ++-- feed_resources/app/build.gradle.kts | 4 ++-- language/app/build.gradle.kts | 4 ++-- multi_host_livestream/app/build.gradle.kts | 4 ++-- picture_in_picture/app/build.gradle.kts | 4 ++-- share_link/app/build.gradle.kts | 4 ++-- shopping/app/build.gradle.kts | 4 ++-- single_host_livestream/app/build.gradle.kts | 2 +- story_block/app/build.gradle.kts | 4 ++-- view_options/app/build.gradle.kts | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/compose/app/build.gradle.kts b/compose/app/build.gradle.kts index 51fecc8..81e01bc 100644 --- a/compose/app/build.gradle.kts +++ b/compose/app/build.gradle.kts @@ -95,7 +95,7 @@ dependencies { debugImplementation("androidx.compose.ui:ui-test-manifest") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/feed_integration/app/build.gradle.kts b/feed_integration/app/build.gradle.kts index f67e72d..a07b533 100644 --- a/feed_integration/app/build.gradle.kts +++ b/feed_integration/app/build.gradle.kts @@ -74,14 +74,14 @@ dependencies { implementation("com.google.android.material:material:1.11.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/feed_resources/app/build.gradle.kts b/feed_resources/app/build.gradle.kts index e0eba9d..b0f1403 100644 --- a/feed_resources/app/build.gradle.kts +++ b/feed_resources/app/build.gradle.kts @@ -75,14 +75,14 @@ dependencies { implementation("com.google.android.material:material:1.11.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/language/app/build.gradle.kts b/language/app/build.gradle.kts index 2e7b81c..68ad35e 100644 --- a/language/app/build.gradle.kts +++ b/language/app/build.gradle.kts @@ -69,14 +69,14 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/multi_host_livestream/app/build.gradle.kts b/multi_host_livestream/app/build.gradle.kts index 0ec4e58..a2aa9e4 100644 --- a/multi_host_livestream/app/build.gradle.kts +++ b/multi_host_livestream/app/build.gradle.kts @@ -65,14 +65,14 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/picture_in_picture/app/build.gradle.kts b/picture_in_picture/app/build.gradle.kts index 9f40c97..0012a46 100644 --- a/picture_in_picture/app/build.gradle.kts +++ b/picture_in_picture/app/build.gradle.kts @@ -77,14 +77,14 @@ dependencies { implementation("com.google.android.material:material:1.9.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/share_link/app/build.gradle.kts b/share_link/app/build.gradle.kts index d5503cb..91b3023 100644 --- a/share_link/app/build.gradle.kts +++ b/share_link/app/build.gradle.kts @@ -74,14 +74,14 @@ dependencies { implementation("com.google.android.material:material:1.11.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/shopping/app/build.gradle.kts b/shopping/app/build.gradle.kts index e893b47..683c1cc 100644 --- a/shopping/app/build.gradle.kts +++ b/shopping/app/build.gradle.kts @@ -67,14 +67,14 @@ dependencies { implementation("com.google.android.material:material:1.11.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/single_host_livestream/app/build.gradle.kts b/single_host_livestream/app/build.gradle.kts index 3e7454a..fd72d49 100644 --- a/single_host_livestream/app/build.gradle.kts +++ b/single_host_livestream/app/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide diff --git a/story_block/app/build.gradle.kts b/story_block/app/build.gradle.kts index 64e84bd..c791a08 100644 --- a/story_block/app/build.gradle.kts +++ b/story_block/app/build.gradle.kts @@ -74,14 +74,14 @@ dependencies { implementation("com.google.android.material:material:1.11.0") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/view_options/app/build.gradle.kts b/view_options/app/build.gradle.kts index 2cd440e..c652e18 100644 --- a/view_options/app/build.gradle.kts +++ b/view_options/app/build.gradle.kts @@ -63,14 +63,14 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.03.28" + val fireworkBomVersion = "2024.04.03" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) From a939a751a516cabb305a86927c8e135b10bb88d7 Mon Sep 17 00:00:00 2001 From: Mohsen Mirhoseini Date: Thu, 4 Apr 2024 20:54:31 +0200 Subject: [PATCH 2/2] Fix Compose Signed-off-by: Mohsen Mirhoseini --- compose/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/app/build.gradle.kts b/compose/app/build.gradle.kts index 81e01bc..4b8b3f9 100644 --- a/compose/app/build.gradle.kts +++ b/compose/app/build.gradle.kts @@ -83,10 +83,10 @@ dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation("androidx.compose.material:material:1.6.4") + implementation("androidx.compose.material:material:1.6.5") // compose - implementation(platform("androidx.compose:compose-bom:2024.03.00")) + implementation(platform("androidx.compose:compose-bom:2024.04.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview")