Merge pull request #387 from THEOplayer/release/v8.0.2

Release/v8.0.2
THEOplayer · Sep 14, 2024 · 02c47a4 · 02c47a4
2 parents b890e7f + 9e3b02d
commit 02c47a4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [8.0.1] - 24-09-14
+
+### Fixed
+
+- Fixed an issue on Android where not all dependencies would be correctly resolved.
+
 ## [8.0.1] - 24-09-11
 
 ### Fixed

diff --git a/android/build.gradle b/android/build.gradle
@@ -111,10 +111,11 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${safeExtGet('coroutinesVersion', '1.7.3')}"
   implementation "androidx.appcompat:appcompat:${safeExtGet('appcompatVersion', '1.6.1')}"
   implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.10.1')}"
+  implementation "com.google.code.gson:gson:2.11.0"
 
   // The minimum supported THEOplayer version is 7.12.0
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[7.12.0, 8.0.0)')
-  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[7.12.0, 8.0.0)')
+  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[7.12.0, 9.0.0)')
+  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[7.12.0, 9.0.0)')
 
   println("Using THEOplayer (${versionString(theoplayer_sdk_version)})")
   implementation "com.theoplayer.theoplayer-sdk-android:core:${theoplayer_sdk_version}"

diff --git a/android/src/main/java/com/theoplayer/source/SourceAdapter.kt b/android/src/main/java/com/theoplayer/source/SourceAdapter.kt
@@ -13,12 +13,12 @@ import com.theoplayer.android.api.source.addescription.AdDescription
 import com.theoplayer.android.api.source.TextTrackDescription
 import com.theoplayer.android.api.source.SourceType
 import com.theoplayer.android.api.source.hls.HlsPlaybackConfiguration
-import com.theoplayer.android.api.event.ads.AdIntegrationKind
 import com.theoplayer.android.api.source.addescription.GoogleImaAdDescription
 import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.source.metadata.ChromecastMetadataImage
 import com.theoplayer.BuildConfig
 import com.theoplayer.android.api.error.ErrorCode
+import com.theoplayer.android.api.source.AdIntegration
 import com.theoplayer.android.api.source.dash.DashPlaybackConfiguration
 import com.theoplayer.drm.ContentProtectionAdapter
 import com.theoplayer.util.BridgeUtils
@@ -246,36 +246,27 @@ class SourceAdapter {
 
   @Throws(JSONException::class, THEOplayerException::class)
   fun parseAdFromJS(jsonAdDescription: JSONObject): AdDescription {
-    val integrationKindStr = jsonAdDescription.optString(PROP_INTEGRATION)
-    return if (!TextUtils.isEmpty(integrationKindStr)) {
-      when (AdIntegrationKind.from(integrationKindStr)) {
-        AdIntegrationKind.GOOGLE_IMA -> parseImaAdFromJS(
+    val integrationStr = jsonAdDescription.optString(PROP_INTEGRATION)
+    return if (!TextUtils.isEmpty(integrationStr)) {
+      when (integrationStr) {
+        AdIntegration.GOOGLE_IMA.adIntegration -> parseImaAdFromJS(
           jsonAdDescription
         )
-
-        AdIntegrationKind.DEFAULT -> {
-          throw THEOplayerException(
-            ErrorCode.AD_ERROR,
-            "$ERROR_UNSUPPORTED_CSAI_INTEGRATION: $integrationKindStr"
-          )
-        }
-
         else -> {
           throw THEOplayerException(
             ErrorCode.AD_ERROR,
-            "$ERROR_UNSUPPORTED_CSAI_INTEGRATION: $integrationKindStr"
+            "$ERROR_UNSUPPORTED_CSAI_INTEGRATION: $integrationStr"
           )
         }
       }
     } else {
       throw THEOplayerException(
         ErrorCode.AD_ERROR,
-        "$ERROR_MISSING_CSAI_INTEGRATION: $integrationKindStr"
+        "$ERROR_MISSING_CSAI_INTEGRATION: $integrationStr"
       )
     }
   }
 
-
   @Throws(THEOplayerException::class)
   private fun parseImaAdFromJS(jsonAdDescription: JSONObject): GoogleImaAdDescription {
     if (!BuildConfig.EXTENSION_GOOGLE_IMA) {

diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -41,7 +41,7 @@ newArchEnabled=false
 hermesEnabled=true
 
 # Version of the THEOplayer SDK, if not specified, the latest available version within bounds is set.
-#THEOplayer_sdk=[7.12.0, 8.0.0)
+#THEOplayer_sdk=[7.12.0, 9.0.0)
 
 # Override Android sdk versions
 #THEOplayer_compileSdkVersion = 34

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",