Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ASDK v6.9.1 (#79) #80

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Update to ASDK v6.9.1 (#79) #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78f1100
Update to ASDK v6.9.1 (#79)
Jan 26, 2024
e2a6607
Fix compose
Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions compose/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ android {
)
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand All @@ -55,14 +56,18 @@ android {
abortOnError = true
ignoreWarnings = false
warningsAsErrors = true

disable.apply {
add("ObsoleteLintCustomCheck")
}
}

buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.7"
kotlinCompilerExtensionVersion = "1.5.8"
}
}

Expand All @@ -77,18 +82,18 @@ 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"))
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")
implementation("androidx.compose.material3:material3")
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)
Expand Down
6 changes: 3 additions & 3 deletions compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 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("org.jetbrains.kotlin.android") version "1.9.21" 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.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
}
Expand Down
2 changes: 1 addition & 1 deletion feed_integration/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions feed_integration/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion feed_resources/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions feed_resources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion multi_host_livestream/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions multi_host_livestream/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion picture_in_picture/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions picture_in_picture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion share_link/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions share_link/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion shopping/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion shopping/app/src/main/java/com/firework/example/shopping/AddToCartModeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class AddToCartModeActivity : AppCompatActivity() {
ShoppingActivity.start(this@AddToCartModeActivity)
}

shopping.setOnProductHydrationListener { products: List<Product>, hydrator: ProductHydrator ->
shopping.setOnProductHydrationListener { products: List<Product>, hydrator: ProductHydrator, _ ->
if (!ALLOW_PRODUCTS_HYDRATION) {
return@setOnProductHydrationListener
}
Expand Down
2 changes: 1 addition & 1 deletion shopping/app/src/main/java/com/firework/example/shopping/ShopNowModeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions shopping/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion single_host_livestream/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions single_host_livestream/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion story_block/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions story_block/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion view_options/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions view_options/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading