From 78f1100d3a30f433deb61529d43b7e339737d057 Mon Sep 17 00:00:00 2001 From: Mohsen Mirhoseini Date: Fri, 26 Jan 2024 07:55:43 +0100 Subject: [PATCH 1/2] Update to ASDK v6.9.1 (#79) Signed-off-by: Mohsen Mirhoseini --- compose/app/build.gradle.kts | 4 ++-- compose/build.gradle.kts | 4 ++-- feed_integration/app/build.gradle.kts | 2 +- feed_integration/build.gradle.kts | 4 ++-- feed_resources/app/build.gradle.kts | 2 +- feed_resources/build.gradle.kts | 4 ++-- multi_host_livestream/app/build.gradle.kts | 2 +- multi_host_livestream/build.gradle.kts | 4 ++-- picture_in_picture/app/build.gradle.kts | 2 +- picture_in_picture/build.gradle.kts | 4 ++-- share_link/app/build.gradle.kts | 2 +- share_link/build.gradle.kts | 4 ++-- shopping/app/build.gradle.kts | 2 +- .../com/firework/example/shopping/AddToCartModeActivity.kt | 2 +- .../java/com/firework/example/shopping/ShopNowModeActivity.kt | 2 +- shopping/build.gradle.kts | 4 ++-- single_host_livestream/app/build.gradle.kts | 2 +- single_host_livestream/build.gradle.kts | 4 ++-- story_block/app/build.gradle.kts | 2 +- story_block/build.gradle.kts | 4 ++-- view_options/app/build.gradle.kts | 2 +- view_options/build.gradle.kts | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/compose/app/build.gradle.kts b/compose/app/build.gradle.kts index 3bec39d..7df4377 100644 --- a/compose/app/build.gradle.kts +++ b/compose/app/build.gradle.kts @@ -77,7 +77,7 @@ 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.5.4") + implementation("androidx.compose.material:material:1.6.0") // compose implementation(platform("androidx.compose:compose-bom:2023.03.00")) @@ -88,7 +88,7 @@ dependencies { debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/feed_integration/app/build.gradle.kts b/feed_integration/app/build.gradle.kts index 9debe77..39d136b 100644 --- a/feed_integration/app/build.gradle.kts +++ b/feed_integration/app/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/feed_integration/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/feed_integration/build.gradle.kts +++ b/feed_integration/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/feed_resources/app/build.gradle.kts b/feed_resources/app/build.gradle.kts index 63331de..0d5bef0 100644 --- a/feed_resources/app/build.gradle.kts +++ b/feed_resources/app/build.gradle.kts @@ -81,7 +81,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/feed_resources/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/feed_resources/build.gradle.kts +++ b/feed_resources/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/multi_host_livestream/app/build.gradle.kts b/multi_host_livestream/app/build.gradle.kts index 7b08c48..e64ca70 100644 --- a/multi_host_livestream/app/build.gradle.kts +++ b/multi_host_livestream/app/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/multi_host_livestream/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/multi_host_livestream/build.gradle.kts +++ b/multi_host_livestream/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/picture_in_picture/app/build.gradle.kts b/picture_in_picture/app/build.gradle.kts index 417ad76..4558487 100644 --- a/picture_in_picture/app/build.gradle.kts +++ b/picture_in_picture/app/build.gradle.kts @@ -78,7 +78,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/picture_in_picture/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/picture_in_picture/build.gradle.kts +++ b/picture_in_picture/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/share_link/app/build.gradle.kts b/share_link/app/build.gradle.kts index e942d3b..8e4d955 100644 --- a/share_link/app/build.gradle.kts +++ b/share_link/app/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/share_link/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/share_link/build.gradle.kts +++ b/share_link/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/shopping/app/build.gradle.kts b/shopping/app/build.gradle.kts index c8fcee1..d600043 100644 --- a/shopping/app/build.gradle.kts +++ b/shopping/app/build.gradle.kts @@ -73,7 +73,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/src/main/java/com/firework/example/shopping/AddToCartModeActivity.kt b/shopping/app/src/main/java/com/firework/example/shopping/AddToCartModeActivity.kt index c6ea4c3..de9453f 100644 --- a/shopping/app/src/main/java/com/firework/example/shopping/AddToCartModeActivity.kt +++ b/shopping/app/src/main/java/com/firework/example/shopping/AddToCartModeActivity.kt @@ -108,7 +108,7 @@ class AddToCartModeActivity : AppCompatActivity() { ShoppingActivity.start(this@AddToCartModeActivity) } - shopping.setOnProductHydrationListener { products: List, hydrator: ProductHydrator -> + shopping.setOnProductHydrationListener { products: List, hydrator: ProductHydrator, _ -> if (!ALLOW_PRODUCTS_HYDRATION) { return@setOnProductHydrationListener } diff --git a/shopping/app/src/main/java/com/firework/example/shopping/ShopNowModeActivity.kt b/shopping/app/src/main/java/com/firework/example/shopping/ShopNowModeActivity.kt index e6267bf..b9f8d2f 100644 --- a/shopping/app/src/main/java/com/firework/example/shopping/ShopNowModeActivity.kt +++ b/shopping/app/src/main/java/com/firework/example/shopping/ShopNowModeActivity.kt @@ -96,7 +96,7 @@ class ShopNowModeActivity : AppCompatActivity(), Shopping.OnShoppingErrorListene startActivity(intent) FireworkSdk.enterPip() } - shopping.setOnProductHydrationListener { products, hydrator -> + shopping.setOnProductHydrationListener { products, hydrator, _ -> if (!ALLOW_PRODUCTS_HYDRATION) { return@setOnProductHydrationListener } diff --git a/shopping/build.gradle.kts b/shopping/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/shopping/build.gradle.kts +++ b/shopping/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/single_host_livestream/app/build.gradle.kts b/single_host_livestream/app/build.gradle.kts index b989310..4fb1c09 100644 --- a/single_host_livestream/app/build.gradle.kts +++ b/single_host_livestream/app/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/single_host_livestream/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/single_host_livestream/build.gradle.kts +++ b/single_host_livestream/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/story_block/app/build.gradle.kts b/story_block/app/build.gradle.kts index 877aea5..562b0ca 100644 --- a/story_block/app/build.gradle.kts +++ b/story_block/app/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" implementation(platform("com.firework:firework-bom:$fireworkBomVersion")) implementation("com.firework:sdk") implementation("com.firework.external.imageloading:glide") // Glide (optional image loader) diff --git a/story_block/build.gradle.kts b/story_block/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/story_block/build.gradle.kts +++ b/story_block/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false diff --git a/view_options/app/build.gradle.kts b/view_options/app/build.gradle.kts index e7434c0..3c68602 100644 --- a/view_options/app/build.gradle.kts +++ b/view_options/app/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2024.01.18" + val fireworkBomVersion = "2024.01.26" 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/build.gradle.kts b/view_options/build.gradle.kts index 24c1d3b..6f11900 100644 --- a/view_options/build.gradle.kts +++ b/view_options/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.21" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false From e2a6607f610cd5c9a243fe49671fe2a6f2d28e37 Mon Sep 17 00:00:00 2001 From: Mohsen Mirhoseini Date: Fri, 26 Jan 2024 09:34:19 +0100 Subject: [PATCH 2/2] Fix compose Signed-off-by: Mohsen Mirhoseini --- compose/app/build.gradle.kts | 9 +++++++-- compose/build.gradle.kts | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/compose/app/build.gradle.kts b/compose/app/build.gradle.kts index 7df4377..e3b7978 100644 --- a/compose/app/build.gradle.kts +++ b/compose/app/build.gradle.kts @@ -41,6 +41,7 @@ android { ) } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -55,6 +56,10 @@ android { abortOnError = true ignoreWarnings = false warningsAsErrors = true + + disable.apply { + add("ObsoleteLintCustomCheck") + } } buildFeatures { @@ -62,7 +67,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.8" } } @@ -80,7 +85,7 @@ dependencies { implementation("androidx.compose.material:material:1.6.0") // compose - implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation(platform("androidx.compose:compose-bom:2024.01.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 6f11900..1618d0b 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.application") version "8.2.2" apply false id("com.android.library") version "8.2.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.21" apply false + id("org.jetbrains.kotlin.android") version "1.9.22" apply false id("org.jlleitschuh.gradle.ktlint") version "12.0.3" apply false id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false }