Version 11

CHANGELOG.md

@@ -7,14 +7,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Added support for player SDK v11. More info on the [migration documentation](./doc/migrating-to-react-native-theoplayer-11.md) page.
+- Enabled core library desugaring for Android to support version 3.39.0 of the Google IMA SDK.
+
 ### Changed
 
 - Upgraded example app to React-Native v0.84.1.
+- Changed the minimum supported iOS/tvOS version to 15.0, dropping support for iOS/tvOS 13 and 14.
 
 ### Fixed
 
 - Fixed an issue on Web where Google IMA could fail to initialize when used with `react-reverse-portal` due to the player container not being attached to the document yet.
 
+### Removed
+
+- Removed deprecated `ResizeEvent` in favor of `DimensionChangeEvent`.
+- Removed deprecated `player.theolive` property in favor of `player.theoLive`.
+- Removed deprecated `source.integration` property in favor of `source.type`.
+
 ## [10.13.0] - 26-03-27
 
 ### Fixed

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.12.3')}"
+        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.13.0')}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '2.2.10')}"
     }
 }
@@ -98,6 +98,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
     packagingOptions {
         exclude 'META-INF/kotlin-stdlib.kotlin_module'
@@ -122,15 +123,16 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 10.12.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[10.12.0, 11.0.0)')
-def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 11.0.0)')
-def theoAdsWrapperVersion = "10.12.0"
+// The minimum supported THEOplayer version is 11.0.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[11.0.0, 12.0.0)')
+def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[11.0.0, 12.0.0)')
+def theoAdsWrapperVersion = "11.0.0"
 def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')
 def appcompatVersion = safeExtGet('appcompatVersion', '1.7.1')
-def corektxVersion = safeExtGet('corektxVersion', '1.16.0')
-def gsonVersion = safeExtGet('gsonVersion', '2.13.1')
+def corektxVersion = safeExtGet('corektxVersion', '1.17.0')
+def gsonVersion = safeExtGet('gsonVersion', '2.13.2')
 def activityktxVersion = safeExtGet('activityktxVersion', '1.10.1')
+def coreLibraryDesugaringVersion = safeExtGet('coreLibraryDesugaringVersion', '2.1.5')
 
 dependencies {
     def addOptiViewIntegration = { enabled, notation, additional = null ->
@@ -156,6 +158,7 @@ dependencies {
     implementation("androidx.core:core-ktx:$corektxVersion")
     implementation("androidx.activity:activity-ktx:$activityktxVersion")
     implementation("com.google.code.gson:gson:$gsonVersion")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:$coreLibraryDesugaringVersion")
 
     println("Using THEOplayer (${versionString(theoVersion)})")
     implementation("com.theoplayer.theoplayer-sdk-android:core:$theoVersion")

android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/10.12.0/ads-wrapper-10.12.0.pom → android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/11.0.0/ads-wrapper-11.0.0.pom

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>10.12.0</modelVersion>
+  <modelVersion>11.0.0</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>10.12.0</version>
+  <version>11.0.0</version>
   <packaging>aar</packaging>
   <dependencies>
     <!-- Include transitive dependencies -->
     <dependency>
       <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
       <artifactId>integration-ads-ima</artifactId>
-      <version>[10.0.0,11.0.0)</version>
+      <version>[11.0.0,12.0.0)</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
   <versioning>
-    <latest>10.12.0</latest>
-    <release>10.12.0</release>
+    <latest>11.0.0</latest>
+    <release>11.0.0</release>
     <versions>
-      <version>10.12.0</version>
+      <version>11.0.0</version>
     </versions>
-    <lastUpdated>20260318164412</lastUpdated>
+    <lastUpdated>20260410095400</lastUpdated>
   </versioning>
 </metadata>

android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt

@@ -133,24 +133,24 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           getMap(PROP_FEATURE_FLAGS)?.toHashMap()?.forEach { (key, value) ->
             convertedMap[key] = value as String
           }
-          featureFlags = convertedMap
+          setFeatureFlags(convertedMap)
         }
         // The maximum number of VAST redirects.
         if (hasKey(PROP_MAX_REDIRECTS)) {
           maxRedirects = getInt(PROP_MAX_REDIRECTS)
         }
         // The partner provided player type.
-        playerType = "THEOplayer"
+        setPlayerType("THEOplayer")
         // The partner provided player version.
-        playerVersion = THEOplayerGlobal.getVersion()
+        setPlayerVersion(THEOplayerGlobal.getVersion())
         // The Publisher Provided Identification (PPID) sent with ads request.
         if (hasKey(PROP_PPID)) {
-          ppid = getString(PROP_PPID) ?: ""
+          setPpid(getString(PROP_PPID) ?: "")
         }
         // The session ID to identify a single user session. This should be a UUID. It
         // is used exclusively for frequency capping across the user session.
         if (hasKey(PROP_SESSION_ID)) {
-          sessionId = getString(PROP_PPID) ?: ""
+          setSessionId(getString(PROP_PPID) ?: "")
         }
         // Toggles debug mode which will output detailed log information to the console.
         if (hasKey(PROP_ENABLE_DEBUG_MODE)) {
@@ -177,11 +177,11 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           enablePreloading = preloadTypeString !== "none"
         }
         if (hasKey(PROP_ALLOWED_MIMETYPES)) {
-          mimeTypes = ArrayList<String>().apply {
+          setMimeTypes(ArrayList<String>().apply {
             getArray(PROP_ALLOWED_MIMETYPES)?.toArrayList()?.forEach {
               add(it as String)
             }
-          }
+          })
         }
       }
       // bitrate and timeout are configured under the ima config

android/src/main/java/com/theoplayer/ads/AdAdapter.kt

@@ -100,7 +100,7 @@ object AdAdapter {
         adPayload.putDouble(PROP_AD_HEIGHT, ad.imaAd.vastMediaHeight.toDouble())
         adPayload.putString(PROP_AD_CONTENT_TYPE, ad.imaAd.contentType)
         adPayload.putString(PROP_AD_DESCRIPTION, ad.imaAd.description)
-      } catch (ignore: Exception) {
+      } catch (_: Exception) {
         // googleImaAd.getImaAd() is not known yet
       }
       val universalAdIdsPayload = Arguments.createArray()
@@ -142,7 +142,7 @@ object AdAdapter {
       return adbreakPayload
     }
     adbreakPayload.putString(PROP_ADBREAK_INTEGRATION, adbreak.integration.type)
-    adbreakPayload.putString(PROP_ADBREAK_ID, adbreak.idAsString)
+    adbreakPayload.putString(PROP_ADBREAK_ID, adbreak.id)
     adbreakPayload.putInt(PROP_ADBREAK_MAXDURATION,adbreak.maxDuration)
     adbreakPayload.putInt(PROP_ADBREAK_TIMEOFFSET, adbreak.timeOffset)
     adbreakPayload.putDouble(PROP_ADBREAK_MAXREMAININGDURATION, adbreak.maxRemainingDuration)
@@ -288,10 +288,15 @@ object AdAdapter {
         return adBreak.getString(PROP_AD_CUSTOM_INTEGRATION)
       }
 
+      @Deprecated("Deprecated in favor of getIdAsString()")
       override fun getIdAsString(): String? {
         return if (adBreak.hasKey(PROP_ADBREAK_ID)) adBreak.getString(PROP_ADBREAK_ID) else null
       }
 
+      override fun getId(): String? {
+        return if (adBreak.hasKey(PROP_ADBREAK_ID)) adBreak.getString(PROP_ADBREAK_ID) else null
+      }
+
       override fun getCustomData(): Any? {
         // Not supported yet
         return null
@@ -415,16 +420,6 @@ object AdAdapter {
         return ad?.getString(PROP_AD_TRAFFICKING_PARAMETERS) ?: ""
       }
 
-      @Deprecated("Deprecated in Java")
-      override fun getUniversalAdIdRegistry(): String {
-        return ""
-      }
-
-      @Deprecated("Deprecated in Java")
-      override fun getUniversalAdIdValue(): String {
-        return ad?.getString(PROP_UNIVERSAL_AD_ID_VALUE) ?: ""
-      }
-
       override fun getCompanionAds(): List<com.google.ads.interactivemedia.v3.api.CompanionAd> {
         return emptyList()
       }

android/src/main/java/com/theoplayer/cast/CastModule.kt

@@ -59,7 +59,6 @@ class CastModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(
       PlayerCastState.AVAILABLE -> "available"
       PlayerCastState.CONNECTED -> "connected"
       PlayerCastState.CONNECTING -> "connecting"
-      PlayerCastState.UNAVAILABLE -> "unavailable"
       else -> "unavailable"
     }
   }

android/src/main/java/com/theoplayer/track/TrackListAdapter.kt

@@ -43,9 +43,6 @@ private const val PROP_ENDDATE = "endDate"
 private const val PROP_DURATION = "duration"
 private const val PROP_PLANNED_DURATION = "plannedDuration"
 private const val PROP_END_ON_NEXT = "endOnNext"
-private const val PROP_SCTE35CMD = "scte35Cmd"
-private const val PROP_SCTE35OUT = "scte35Out"
-private const val PROP_SCTE35IN = "scte35In"
 private const val PROP_CUSTOM_ATTRIBUTES = "customAttributes"
 
 object TrackListAdapter {
@@ -167,13 +164,12 @@ object TrackListAdapter {
     audioTrackPayload.putString(PROP_LABEL, audioTrack.label)
     audioTrackPayload.putString(PROP_LANGUAGE, audioTrack.language)
     audioTrackPayload.putBoolean(PROP_ENABLED, audioTrack.isEnabled)
-    val qualityList = audioTrack.qualities
     val qualities = Arguments.createArray()
     try {
-      qualityList?.forEach { quality ->
+      audioTrack.qualities.forEach { quality ->
         qualities.pushMap(fromAudioQuality(quality))
       }
-    } catch (ignore: NullPointerException) {
+    } catch (_: NullPointerException) {
     }
     audioTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = audioTrack.activeQuality
@@ -214,18 +210,15 @@ object TrackListAdapter {
     videoTrackPayload.putBoolean(PROP_ENABLED, videoTrack.isEnabled)
     val qualities = Arguments.createArray()
     try {
-      val qualityList = videoTrack.qualities
-      if (qualityList != null) {
-        // Sort qualities according to (height, bandwidth)
-        val sortedQualityList = QualityListAdapter(qualityList)
-        sortedQualityList.sort { o: VideoQuality, t1: VideoQuality ->
-          if (o.height == t1.height) t1.bandwidth.compareTo(o.bandwidth) else t1.height.compareTo(o.height)
-        }
-        for (quality in sortedQualityList) {
-          qualities.pushMap(fromVideoQuality(quality as VideoQuality))
-        }
+      // Sort qualities according to (height, bandwidth)
+      val sortedQualityList = QualityListAdapter(videoTrack.qualities)
+      sortedQualityList.sort { o: VideoQuality, t1: VideoQuality ->
+        if (o.height == t1.height) t1.bandwidth.compareTo(o.bandwidth) else t1.height.compareTo(o.height)
+      }
+      for (quality in sortedQualityList) {
+        qualities.pushMap(fromVideoQuality(quality as VideoQuality))
       }
-    } catch (ignore: java.lang.NullPointerException) {
+    } catch (_: java.lang.NullPointerException) {
     }
     videoTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = videoTrack.activeQuality

doc/migrating-to-react-native-theoplayer-11.md

@@ -0,0 +1,41 @@
+# Migrating to THEOplayer React Native SDK 11.x
+
+This article will guide you through updating to THEOplayer React Native SDK version 11 (from version 10),
+and the changes needed in your code.
+
+## Update React Native THEOplayer
+
+Run the following command to install THEOplayer React Native SDK version 11:
+
+```bash
+npm install react-native-theoplayer@11
+```
+
+## Breaking API changes
+
+- Removed deprecated `ResizeEvent` in favor of `DimensionChangeEvent`.
+- Removed deprecated `player.theolive` property in favor of `player.theoLive`.
+- Removed deprecated `source.integration` property in favor of `source.type`.
+
+## Breaking Changes on Web
+
+The breaking changes for the native Web SDK are listed in the v11 [changelog](https://optiview.dolby.com/docs/theoplayer/changelog/#-breaking-changes),
+none of which impact the React Native SDK on Web.
+
+## Breaking Changes on iOS
+
+The breaking changes for the native Web SDK are listed in the v11 [changelog](https://optiview.dolby.com/docs/theoplayer/changelog/#-breaking-changes-2).
+
+The following updates in particular impact the React Native SDK on iOS.
+
+- The minimum supported iOS/tvOS version is now 15.0, dropping support for iOS/tvOS 13 and 14.
+
+## Breaking Changes on Android
+
+The breaking changes for the native Android SDK are listed in the v11 [changelog](https://optiview.dolby.com/docs/theoplayer/changelog/#-breaking-changes-1).
+
+The following updates in particular impact the React Native SDK on Android.
+
+- The Google IMA SDK integration now requires [core library desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) to be enabled.
+See [our updated guide for Google IMA](https://optiview.dolby.com/docs/theoplayer/how-to-guides/ads/google-ima/#android-sdk) for instructions, or the
+React Native THEOplayer [example app](https://github.com/THEOplayer/react-native-theoplayer/tree/develop/example) for a sample implementation.

e2e/android/app/build.gradle

@@ -94,6 +94,9 @@ android {
             keyPassword 'android'
         }
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+    }
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
@@ -119,6 +122,8 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

e2e/android/app/src/main/java/com/reactnativetheoplayer/MainApplication.kt

@@ -5,34 +5,20 @@ import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
-import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 import com.theoplayer.ReactTHEOplayerPackage
 
 class MainApplication : Application(), ReactApplication {
-  override val reactNativeHost: ReactNativeHost =
-    object : DefaultReactNativeHost(this) {
-      override fun getPackages(): List<ReactPackage> =
+  override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
         PackageList(this).packages.apply {
           // Packages that cannot be autolinked yet can be added manually here, for example:
           add(ReactTHEOplayerPackage())
-        }
-
-      override fun getJSMainModuleName(): String = "index"
-
-      override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-      override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-      override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
-
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+        },
+    )
+  }
 
   override fun onCreate() {
     super.onCreate()

e2e/android/build.gradle

@@ -12,8 +12,8 @@ buildscript {
     ndkVersion = "29.0.14033849"
     castFrameworkVersion = "22.0.0"
     kotlinVersion = "2.2.10"
-    agpVersion = "8.12.3"
-    rnrepoVersion = "0.2.1"
+    agpVersion = "8.13.0"
+    rnrepoVersion = "0.2.2"
   }
   repositories {
     google()

e2e/android/gradle.properties

@@ -41,12 +41,12 @@ newArchEnabled=true
 hermesEnabled=true
 
 # Version of the THEOplayer SDK, if not specified, the latest available version within bounds is set.
-#THEOplayer_sdk=[10.10.0, 11.0.0)
+#THEOplayer_sdk=[11.0.0, 12.0.0)
 
 # Override Android sdk versions
-#THEOplayer_compileSdkVersion = 34
+#THEOplayer_compileSdkVersion = 36
 #THEOplayer_minSdkVersion = 21
-#THEOplayer_targetSdkVersion = 34
+#THEOplayer_targetSdkVersion = 36
 
 # Toggle player event logging using tag 'VideoPlayer' (default: false)
 #THEOplayer_logPlayerEvents = true