react-native-theoplayer 1.8.1 → 1.8.3

package/android/build.gradle

@@ -96,37 +96,40 @@ dependencies {
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
   implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:4.3.0"
 
-  def THEOplayerVersion = safeExtGet('THEOplayer_sdk', '+')
+  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '+')
+  def enabledV4 = theoplayer_sdk_version.toString().startsWith("4.")
+  def core_prefix = enabledV4 ? 'unified' : 'core'
+  def integration_prefix = enabledV4 ? 'unified' : 'integration'
 
-  println("Using THEOplayer v${THEOplayerVersion}")
-  implementation "com.theoplayer.theoplayer-sdk-android:unified:${THEOplayerVersion}"
+  println("Using THEOplayer v${theoplayer_sdk_version}")
+  implementation "com.theoplayer.theoplayer-sdk-android:${core_prefix}:${theoplayer_sdk_version}"
 
   if (enabledGoogleIMA) {
     println('ENABLE THEOplayer IMA extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:unified-ads:${THEOplayerVersion}"
-    implementation "com.theoplayer.theoplayer-sdk-android:unified-ads-ima:${THEOplayerVersion}"
+    implementation "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads-ima:${theoplayer_sdk_version}"
   } else {
     println('DISABLE THEOplayer IMA extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:unified-ads:${THEOplayerVersion}"
-    compileOnly "com.theoplayer.theoplayer-sdk-android:unified-ads-ima:${THEOplayerVersion}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads-ima:${theoplayer_sdk_version}"
   }
 
   // NOTE: The DAI extension module is available on Maven as of SDK v4.3.0
   if (enabledGoogleDAI) {
     println('ENABLE THEOplayer DAI extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:unified-ads:${THEOplayerVersion}"
-    implementation "com.theoplayer.theoplayer-sdk-android:unified-ads-dai:${THEOplayerVersion}"
+    implementation "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads-dai:${theoplayer_sdk_version}"
   } else {
     println('DISABLE THEOplayer DAI extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:unified-ads:${THEOplayerVersion}"
-    compileOnly "com.theoplayer.theoplayer-sdk-android:unified-ads-dai:${THEOplayerVersion}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-ads-dai:${theoplayer_sdk_version}"
   }
 
   if (enabledCast) {
     println('ENABLE THEOplayer cast extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:unified-cast:${THEOplayerVersion}"
+    implementation "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-cast:${theoplayer_sdk_version}"
   } else {
     println('DISABLE THEOplayer cast extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:unified-cast:${THEOplayerVersion}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:${integration_prefix}-cast:${theoplayer_sdk_version}"
   }
 }

package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt

@@ -494,12 +494,12 @@ class PlayerEventEmitter internal constructor(
     val qualityChangedEventType =
       (if (trackType === MediaTrackType.AUDIO)
         AudioTrackEventTypes.ACTIVEQUALITYCHANGEDEVENT
-      else VideoTrackEventTypes.ACTIVEQUALITYCHANGEDEVENT) as EventType<QualityChangedEvent<Q, ActiveQualityChangedEvent>>
+      else VideoTrackEventTypes.ACTIVEQUALITYCHANGEDEVENT)
     when (eventType) {
-      TrackEventType.ADD_TRACK -> track.addEventListener(qualityChangedEventType) { event: QualityChangedEvent<Q, ActiveQualityChangedEvent> ->
+      TrackEventType.ADD_TRACK -> track.addEventListener(qualityChangedEventType) { event ->
         onActiveQualityChanged(event)
       }
-      TrackEventType.REMOVE_TRACK -> track.removeEventListener(qualityChangedEventType) { event: QualityChangedEvent<Q, ActiveQualityChangedEvent> ->
+      TrackEventType.REMOVE_TRACK -> track.removeEventListener(qualityChangedEventType) { event ->
         onActiveQualityChanged(event)
       }
       else -> { /* ignore */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -111,6 +111,6 @@
   },
   "dependencies": {
     "buffer": "^6.0.3",
-    "theoplayer": "^4.6.0"
+    "theoplayer": "^5.0.0"
   }
 }