From 7d631d5d1684dc2264e35d24c81353e19f49692f Mon Sep 17 00:00:00 2001 From: Mohsen Mirhoseini Date: Fri, 19 Jan 2024 20:37:19 +0100 Subject: [PATCH] Update to ASDK v6.9.0 (#79) Signed-off-by: Mohsen Mirhoseini --- compose/app/build.gradle.kts | 4 ++-- compose/build.gradle.kts | 4 ++-- feed_integration/app/build.gradle.kts | 4 ++-- .../example/feedintegration/recyclerview/FeedListAdapter.kt | 2 ++ feed_integration/build.gradle.kts | 4 ++-- feed_resources/app/build.gradle.kts | 4 ++-- feed_resources/build.gradle.kts | 4 ++-- multi_host_livestream/app/build.gradle.kts | 4 ++-- multi_host_livestream/build.gradle.kts | 4 ++-- picture_in_picture/app/build.gradle.kts | 4 ++-- picture_in_picture/build.gradle.kts | 4 ++-- share_link/app/build.gradle.kts | 4 ++-- share_link/build.gradle.kts | 4 ++-- shopping/app/build.gradle.kts | 4 ++-- .../com/firework/example/shopping/AddToCartModeActivity.kt | 4 ++-- .../java/com/firework/example/shopping/ShopNowModeActivity.kt | 2 +- shopping/build.gradle.kts | 4 ++-- single_host_livestream/app/build.gradle.kts | 4 ++-- single_host_livestream/build.gradle.kts | 4 ++-- story_block/app/build.gradle.kts | 4 ++-- story_block/build.gradle.kts | 4 ++-- view_options/app/build.gradle.kts | 4 ++-- view_options/build.gradle.kts | 4 ++-- 23 files changed, 45 insertions(+), 43 deletions(-) diff --git a/compose/app/build.gradle.kts b/compose/app/build.gradle.kts index fd215d4..3bec39d 100644 --- a/compose/app/build.gradle.kts +++ b/compose/app/build.gradle.kts @@ -75,7 +75,7 @@ detekt { dependencies { implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + 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") @@ -88,7 +88,7 @@ dependencies { debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 940a4fe..9debe77 100644 --- a/feed_integration/app/build.gradle.kts +++ b/feed_integration/app/build.gradle.kts @@ -77,10 +77,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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/src/main/java/com/firework/example/feedintegration/recyclerview/FeedListAdapter.kt b/feed_integration/app/src/main/java/com/firework/example/feedintegration/recyclerview/FeedListAdapter.kt index 0e1f2d3..6b9542a 100644 --- a/feed_integration/app/src/main/java/com/firework/example/feedintegration/recyclerview/FeedListAdapter.kt +++ b/feed_integration/app/src/main/java/com/firework/example/feedintegration/recyclerview/FeedListAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package com.firework.example.feedintegration.recyclerview import android.view.LayoutInflater diff --git a/feed_integration/build.gradle.kts b/feed_integration/build.gradle.kts index 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 6cda946..63331de 100644 --- a/feed_resources/app/build.gradle.kts +++ b/feed_resources/app/build.gradle.kts @@ -78,10 +78,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 181263f..7b08c48 100644 --- a/multi_host_livestream/app/build.gradle.kts +++ b/multi_host_livestream/app/build.gradle.kts @@ -68,10 +68,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 b78541d..417ad76 100644 --- a/picture_in_picture/app/build.gradle.kts +++ b/picture_in_picture/app/build.gradle.kts @@ -75,10 +75,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 da03fcd..e942d3b 100644 --- a/share_link/app/build.gradle.kts +++ b/share_link/app/build.gradle.kts @@ -77,10 +77,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 ff20bbe..c8fcee1 100644 --- a/shopping/app/build.gradle.kts +++ b/shopping/app/build.gradle.kts @@ -70,10 +70,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 d1e26f8..c6ea4c3 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 @@ -95,7 +95,7 @@ class AddToCartModeActivity : AppCompatActivity() { ), ) shopping.setShoppingCartBehaviour(Shopping.CartBehaviour.Embedded("some title")) - shopping.setOnCtaButtonClicked { productId, unitId, _ -> + shopping.setOnCtaButtonClicked { productId, unitId, _, _ -> uiScope.launch { FireworkSdk.shopping.setCtaButtonStatus(Shopping.CtaButtonStatus.Loading) delay(LONG_OPERATION_DELAY) @@ -122,7 +122,7 @@ class AddToCartModeActivity : AppCompatActivity() { ShoppingCartRepository.setProducts(hydratedProducts) } } - shopping.setOnProductLinkClickListener { _, _, productWebUrl -> + shopping.setOnProductLinkClickListener { _, _, productWebUrl, _ -> Toast.makeText( this@AddToCartModeActivity, "Host App: Product Url: $productWebUrl", 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 bb3ecbf..e6267bf 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 @@ -87,7 +87,7 @@ class ShopNowModeActivity : AppCompatActivity(), Shopping.OnShoppingErrorListene ), ), ) - shopping.setOnCtaButtonClicked { _, _, productWebUrl -> + shopping.setOnCtaButtonClicked { _, _, productWebUrl, _ -> val webpage: Uri = Uri.parse(productWebUrl) val intent = Intent(Intent.ACTION_VIEW, webpage).apply { diff --git a/shopping/build.gradle.kts b/shopping/build.gradle.kts index 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 18df95a..b989310 100644 --- a/single_host_livestream/app/build.gradle.kts +++ b/single_host_livestream/app/build.gradle.kts @@ -68,10 +68,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 a83f6da..877aea5 100644 --- a/story_block/app/build.gradle.kts +++ b/story_block/app/build.gradle.kts @@ -77,10 +77,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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 719f675..e7434c0 100644 --- a/view_options/app/build.gradle.kts +++ b/view_options/app/build.gradle.kts @@ -66,10 +66,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Glide - implementation("com.github.bumptech.glide:glide:4.13.2") + implementation("com.github.bumptech.glide:glide:4.16.0") // Firework SDK - val fireworkBomVersion = "2023.11.01" + val fireworkBomVersion = "2024.01.18" 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 622be7e..24c1d3b 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.0" apply false - id("com.android.library") version "8.2.0" apply false + id("com.android.application") version "8.2.1" apply false + id("com.android.library") version "8.2.1" 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