Update Multi-Host Livestream to ASDK 6.3.4 (#63)

**What** - Updating the Multi-Host Livestream App to ASDK 6.3.4 Signed-off-by: Mohsen Mirhoseini <[email protected]>
loopsocial · Jul 3, 2023 · 7202933 · 7202933
1 parent 168ad88
commit 7202933
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 130 deletions.
diff --git a/.github/workflows/multi_host_livestream.yml b/.github/workflows/multi_host_livestream.yml
@@ -18,10 +18,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 

diff --git a/multi_host_livestream/.idea/codeStyles/Project.xml b/multi_host_livestream/.idea/codeStyles/Project.xml
diff --git a/multi_host_livestream/app/build.gradle.kts b/multi_host_livestream/app/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
 android {
     namespace = "com.firework.example.multihostlivestream"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.firework.example.multihostlivestream"
 
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
 
         versionCode = 1
         versionName = "1.0.0"
@@ -33,13 +33,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
         allWarningsAsErrors = true
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     lint {
@@ -71,7 +71,7 @@ dependencies {
     implementation("com.github.bumptech.glide:glide:4.13.2")
 
     // Firework SDK
-    val fireworkSdkVersion = "6.2.1"
+    val fireworkSdkVersion = "6.3.4"
     implementation("com.firework:sdk:$fireworkSdkVersion")
 
     // Glide (optional image loader)

diff --git a/...vestream/app/src/main/java/com/firework/example/multihostlivestream/ExampleApplication.kt b/...vestream/app/src/main/java/com/firework/example/multihostlivestream/ExampleApplication.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.util.Log
 import com.firework.example.multihostlivestream.BuildConfig.FW_CLIENT_ID
 import com.firework.imageloading.glide.GlideImageLoaderFactory
-import com.firework.livestream.multihost.MultihostLivestreamPlayerInitializer
+import com.firework.livestream.multihost.MultiHostLivestreamPlayerInitializer
 import com.firework.sdk.FireworkSdk
 import com.firework.sdk.FireworkSdkConfig
 
@@ -18,9 +18,9 @@ class ExampleApplication : Application() {
             .checksumRequired(false)
             .clientId(FW_CLIENT_ID) // Client OAUTH Id
             .userId("example app user ID") // User Id in your eco-system
-            .imageLoader(GlideImageLoaderFactory.createInstance()) // glide, picasso, or your implementation
+            .imageLoader(GlideImageLoaderFactory.createInstance(context = this)) // glide, picasso, or your implementation
             // Single-Host and Multi-Host Livestreams can be used together, and single-host will be used as a fallback if multi-host is missing
-            .addLivestreamPlayerInitializer(MultihostLivestreamPlayerInitializer())
+            .addLivestreamPlayerInitializer(MultiHostLivestreamPlayerInitializer())
             .build()
 
         // initialize Firework Android SDK v6

diff --git 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 "7.4.2" apply false
-    id("com.android.library") version "7.4.2" apply false
+    id("com.android.application") version "8.0.2" apply false
+    id("com.android.library") version "8.0.2" apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("org.jlleitschuh.gradle.ktlint") version "11.3.1" apply false
     id("io.gitlab.arturbosch.detekt") version "1.22.0" apply false

diff --git a/multi_host_livestream/gradle.properties b/multi_host_livestream/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/multi_host_livestream/gradle/wrapper/gradle-wrapper.jar b/multi_host_livestream/gradle/wrapper/gradle-wrapper.jar
diff --git a/multi_host_livestream/gradle/wrapper/gradle-wrapper.properties b/multi_host_livestream/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 11 11:32:32 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists