react-native-theoplayer 9.10.0 → 10.1.0

package/CHANGELOG.md

@@ -5,6 +5,41 @@ 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).
 
+## [10.1.0] - 25-10-06
+
+### Added
+
+- Added an explicit clearing of the NowPlayingInfo on iOS, when the app receives a `willTerminateNotification`, to make sure all NowPlayingInfo is removed from the lock screen when an app is closed.
+- Added `videoWidth` and `videoHeight` properties to `THEOplayer` containing the active video's resolution in pixels.
+- Added `videoresize` player event enabling monitoring of video rendition resizes.
+- Added `dimensionchange` player event enabling monitoring of player resizes. This event is set to replace the now deprecated `resize` player event.
+- Added `fontPath` to `TextTrackStyle` to allow loading custom fonts from the Android assets folder.
+
+### Fixed
+
+- Fixed an issue on Android where play-out of Millicast sources in the example app would fail. The Android NDK version needs to be at least v28.
+- Fixed an issue on Web where on older devices the `display: contents` style property is sometimes not supported.
+- Fixed an issue on Android where the `MediaPlaybackService` could be restarted after the app was closed, in some cases causing a `ForegroundServiceDidNotStartInTimeException`. A conditional receiver makes sure the service is never restarted.
+- Fixed an issue on iOS where a setup with multiple players could cause a view index NSInternalInconsistencyException after moving players in and out of fullscreen.
+- Fixed an issue on Android where some event listeners were not properly disposed of after destroying the player.
+- Fixed an issue on Web where the `width` and `height` properties on `THEOplayer` would show the active video rendition's resolution width and height instead of the width and height of the video element.
+
+## [10.0.0] - 25-09-15
+
+### Added
+
+- Added support for player SDK v10. More info on the [migration documentation](./doc/migrating-to-react-native-theoplayer-10.md) page.
+- Added iOS and Android support for THEOads API and THEOads events.
+
+### Fixed
+
+- Fixed an issue on Android where the app could still enter picture-in-picture presentation mode after closing the player.
+
+### Changed
+
+- Upgraded the example app to React-Native v0.81.
+- All child views of `<THEOplayerView>` are being hidden when transitioning to picture-in-picture presentation mode on Android.
+
 ## [9.10.0] - 25-08-19
 
 ### Fixed

package/README.md

@@ -183,10 +183,11 @@ This section gives an overview of features, limitations and known issues:
 - [Casting with Chromecast and Airplay](./doc/cast.md)
 - [Common Media Client Data (CMCD)](./doc/cmcd.md)
 - [Digital Rights Management (DRM)](./doc/drm.md)
-- [Expo🔥](./doc/expo.md)
+- [Expo](./doc/expo.md)
 - [Fullscreen presentation](./doc/fullscreen.md)
 - [Media Caching](./doc/media-caching.md)
 - [Migrating to THEOplayer 9.x](./doc/migrating-to-react-native-theoplayer-9.md)
+- [Migrating to THEOplayer 10.x🔥](./doc/migrating-to-react-native-theoplayer-10.md)
 - [Millicast](./doc/millicast.md)
 - [Picture-in-Picture (PiP)](./doc/pip.md)
 - [Subtitles, Closed Captions and Metadata tracks](./doc/texttracks.md)

package/android/build.gradle

@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.3.2')}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.9.21')}"
+        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.12.3')}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '2.2.10')}"
     }
 }
 
@@ -43,12 +43,12 @@ def enabledMediaSession = safeExtGet("THEOplayer_extensionMediaSession", 'true')
 def enabledMillicast = safeExtGet("THEOplayer_extensionMillicast", 'false').toBoolean()
 
 android {
-    compileSdk safeExtGet('THEOplayer_compileSdkVersion', 35)
+    compileSdk safeExtGet('THEOplayer_compileSdkVersion', 36)
     namespace "com.theoplayer"
 
     defaultConfig {
-        minSdkVersion safeExtGet('THEOplayer_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('THEOplayer_targetSdkVersion', 35)
+        minSdkVersion safeExtGet('THEOplayer_minSdkVersion', 23)
+        targetSdkVersion safeExtGet('THEOplayer_targetSdkVersion', 36)
         versionCode 1
         versionName "1.0"
 
@@ -124,16 +124,15 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 9.9.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[9.9.0, 10.0.0)')
-def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 10.0.0)')
-def theoAdsWrapperVersion = "9.0.0"
+// The minimum supported THEOplayer version is 10.0.1
+def theoVersion = safeExtGet('THEOplayer_sdk', '[10.0.1, 11.0.0)')
+def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 11.0.0)')
+def theoAdsWrapperVersion = "10.0.0"
 def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')
 def appcompatVersion = safeExtGet('appcompatVersion', '1.7.1')
-def corektxVersion = safeExtGet('corektxVersion', '1.13.1')
+def corektxVersion = safeExtGet('corektxVersion', '1.16.0')
 def gsonVersion = safeExtGet('gsonVersion', '2.13.1')
 def activityktxVersion = safeExtGet('activityktxVersion', '1.10.1')
-def millicastVersion = safeExtGet('millicastVersion', '2.4.3')
 
 dependencies {
     def addOptiViewIntegration = { enabled, notation, additional = null ->
@@ -169,5 +168,5 @@ dependencies {
     addOptiViewIntegration(enabledGoogleDAI || enabledTHEOads, 'integration-ads-dai')
     addOptiViewIntegration(enabledTHEOads, 'integration-ads-theoads')
     addOptiViewIntegration(enabledCast, 'integration-cast')
-    addOptiViewIntegration(enabledMillicast, 'integration-millicast', "com.millicast:millicast-sdk-android:$millicastVersion")
+    addOptiViewIntegration(enabledMillicast, 'integration-millicast')
 }

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{9.0.0/ads-wrapper-9.0.0.pom → 10.0.0/ads-wrapper-10.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>9.0.0</modelVersion>
+  <modelVersion>10.0.0</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>9.0.0</version>
+  <version>10.0.0</version>
   <packaging>aar</packaging>
   <dependencies>
     <!-- Include transitive dependencies -->
     <dependency>
       <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
       <artifactId>integration-ads-ima</artifactId>
-      <version>[9.0.0,10.0.0)</version>
+      <version>[10.0.0,11.0.0)</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

package/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>9.0.0</latest>
-    <release>9.0.0</release>
+    <latest>10.0.0</latest>
+    <release>10.0.0</release>
     <versions>
-      <version>9.0.0</version>
+      <version>10.0.0</version>
     </versions>
-    <lastUpdated>20250327163212</lastUpdated>
+    <lastUpdated>20250913190622</lastUpdated>
   </versioning>
 </metadata>

package/android/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
       </intent-filter>
     </service>
 
-  <receiver android:name="androidx.media.session.MediaButtonReceiver"
+  <receiver android:name=".media.ConditionalMediaButtonReceiver"
     android:exported="false">
     <intent-filter>
       <action android:name="android.intent.action.MEDIA_BUTTON" />

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

@@ -12,6 +12,7 @@ import com.facebook.react.uimanager.common.UIManagerType
 import com.theoplayer.ads.AdEventAdapter
 import com.theoplayer.ads.AdEventAdapter.AdEventEmitter
 import com.theoplayer.android.api.THEOplayerGlobal
+import com.theoplayer.android.api.ads.theoads.theoAds
 import com.theoplayer.android.api.error.THEOplayerException
 import com.theoplayer.android.api.event.EventListener
 import com.theoplayer.android.api.event.EventType
@@ -43,6 +44,7 @@ import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.player.track.texttrack.TextTrackMode
 import com.theoplayer.cast.CastEventAdapter
 import com.theoplayer.presentation.PresentationModeChangeContext
+import com.theoplayer.theoads.THEOadsEventAdapter
 import com.theoplayer.theolive.THEOliveEventAdapter
 import com.theoplayer.track.*
 import com.theoplayer.util.PayloadBuilder
@@ -77,9 +79,11 @@ private const val EVENT_MEDIATRACK_EVENT = "onNativeMediaTrackEvent"
 private const val EVENT_AD_EVENT = "onNativeAdEvent"
 private const val EVENT_CAST_EVENT = "onNativeCastEvent"
 private const val EVENT_THEOLIVE_EVENT = "onNativeTHEOliveEvent"
+private const val EVENT_THEOADS_EVENT = "onNativeTHEOadsEvent"
 private const val EVENT_PRESENTATIONMODECHANGE = "onNativePresentationModeChange"
 private const val EVENT_VOLUMECHANGE = "onNativeVolumeChange"
-private const val EVENT_RESIZE = "onNativeResize"
+private const val EVENT_DIMENSIONCHANGE = "onNativeDimensionChange"
+private const val EVENT_VIDEORESIZE = "onNativeVideoResize"
 
 private const val EVENT_PROP_TYPE = "type"
 private const val EVENT_PROP_STATE = "state"
@@ -120,9 +124,11 @@ class PlayerEventEmitter internal constructor(
     EVENT_AD_EVENT,
     EVENT_CAST_EVENT,
     EVENT_THEOLIVE_EVENT,
+    EVENT_THEOADS_EVENT,
     EVENT_PRESENTATIONMODECHANGE,
     EVENT_VOLUMECHANGE,
-    EVENT_RESIZE
+    EVENT_DIMENSIONCHANGE,
+    EVENT_VIDEORESIZE
   )
   annotation class VideoEvents
 
@@ -155,9 +161,11 @@ class PlayerEventEmitter internal constructor(
       EVENT_AD_EVENT,
       EVENT_CAST_EVENT,
       EVENT_THEOLIVE_EVENT,
+      EVENT_THEOADS_EVENT,
       EVENT_PRESENTATIONMODECHANGE,
       EVENT_VOLUMECHANGE,
-      EVENT_RESIZE
+      EVENT_DIMENSIONCHANGE,
+      EVENT_VIDEORESIZE
     )
   }
 
@@ -169,11 +177,12 @@ class PlayerEventEmitter internal constructor(
   private var adEventAdapter: AdEventAdapter? = null
   private var castEventAdapter: CastEventAdapter? = null
   private var theoLiveEventAdapter: THEOliveEventAdapter? = null
+  private var theoAdsEventAdapter: THEOadsEventAdapter? = null
   private var lastTimeUpdate: Long = 0
   private var lastCurrentTime = 0.0
-  private var resizeListener = View.OnLayoutChangeListener { v, _, _, _, _, oldLeft, oldTop, oldRight, oldBottom ->
+  private var dimensionChangeListener = View.OnLayoutChangeListener { v, _, _, _, _, oldLeft, oldTop, oldRight, oldBottom ->
     if (v.width != oldRight - oldLeft || v.height != oldBottom - oldTop) {
-      onResize(v.width, v.height)
+      onDimensionChange(v.width, v.height)
     }
   }
 
@@ -227,6 +236,8 @@ class PlayerEventEmitter internal constructor(
       EventListener { event: PresentationModeChange -> onPresentationModeChange(event) }
     playerListeners[PlayerEventTypes.VOLUMECHANGE] =
       EventListener { event: VolumeChangeEvent -> onVolumeChange(event) }
+    playerListeners[PlayerEventTypes.RESIZE] =
+      EventListener { event: ResizeEvent -> onResize(event) }
     textTrackListeners[TextTrackListEventTypes.ADDTRACK] =
       EventListener { event: AddTrackEvent -> onTextTrackAdd(event) }
     textTrackListeners[TextTrackListEventTypes.REMOVETRACK] =
@@ -432,13 +443,20 @@ class PlayerEventEmitter internal constructor(
     )
   }
 
-  private fun onResize(width: Int, height: Int) {
+  private fun onDimensionChange(width: Int, height: Int) {
     receiveEvent(
-      EVENT_RESIZE,
+      EVENT_DIMENSIONCHANGE,
       PayloadBuilder().size(width, height).build()
     )
   }
 
+  private fun onResize(event: ResizeEvent) {
+    receiveEvent(
+      EVENT_VIDEORESIZE,
+      PayloadBuilder().videoSize(event.width, event.height).build()
+    )
+  }
+
   private val onTextTrackAddCue = EventListener<AddCueEvent> { event ->
     val payload = PayloadBuilder().textTrackCue(event.cue, event.track).build().apply {
       putInt(EVENT_PROP_TYPE, TextTrackCueEventType.ADD_CUE.type)
@@ -614,7 +632,7 @@ class PlayerEventEmitter internal constructor(
     if (BuildConfig.LOG_PLAYER_EVENTS) {
       try {
         Log.d(TAG, "receiveEvent $type $event")
-      } catch (ignore: RuntimeException) {
+      } catch (_: RuntimeException) {
       }
     }
     UIManagerHelper.getUIManager(
@@ -622,6 +640,7 @@ class PlayerEventEmitter internal constructor(
       if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
         UIManagerType.FABRIC
       } else {
+        @Suppress("DEPRECATION")
         UIManagerType.DEFAULT
       })?.receiveEvent(UIManagerHelper.getSurfaceId(playerView), viewId, type, event)
   }
@@ -683,8 +702,17 @@ class PlayerEventEmitter internal constructor(
       }
     })
 
+    if (BuildConfig.EXTENSION_THEOADS) {
+      theoAdsEventAdapter =
+        THEOadsEventAdapter(player.theoAds, object : THEOadsEventAdapter.Emitter {
+          override fun emit(payload: WritableMap?) {
+            receiveEvent(EVENT_THEOADS_EVENT, payload)
+          }
+        })
+    }
+
     // Attach view size listener
-    playerView.addOnLayoutChangeListener(resizeListener)
+    playerView.addOnLayoutChangeListener(dimensionChangeListener)
   }
 
   fun removeListeners(player: Player?) {
@@ -721,10 +749,11 @@ class PlayerEventEmitter internal constructor(
     }
 
     // Remove view size listener
-    playerView.removeOnLayoutChangeListener(resizeListener)
+    playerView.removeOnLayoutChangeListener(dimensionChangeListener)
 
     castEventAdapter?.destroy()
     adEventAdapter?.destroy()
     theoLiveEventAdapter?.destroy()
+    theoAdsEventAdapter?.destroy()
   }
 }

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

@@ -1,33 +1,51 @@
 package com.theoplayer
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.NativeModule
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.theoplayer.ads.AdsModule
 import com.theoplayer.cache.CacheModule
 import com.theoplayer.drm.ContentProtectionModule
 import com.theoplayer.cast.CastModule
 import com.theoplayer.broadcast.EventBroadcastModule
-import com.theoplayer.playback.PlaybackSettingsModule
 import com.theoplayer.player.PlayerModule
 import com.theoplayer.theolive.THEOliveModule
+import com.theoplayer.theoads.THEOadsModule
 
-class ReactTHEOplayerPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(
-      PlayerModule(reactContext),
-      AdsModule(reactContext),
-      ContentProtectionModule(reactContext),
-      CastModule(reactContext),
-      CacheModule(reactContext),
-      EventBroadcastModule(reactContext),
-      PlaybackSettingsModule(reactContext),
-      THEOliveModule(reactContext)
-    )
+@Suppress("unused")
+class ReactTHEOplayerPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return when (name) {
+      PlayerModule.NAME -> PlayerModule(reactContext)
+      AdsModule.NAME -> AdsModule(reactContext)
+      ContentProtectionModule.NAME -> ContentProtectionModule(reactContext)
+      CastModule.NAME -> CastModule(reactContext)
+      CacheModule.NAME -> CacheModule(reactContext)
+      EventBroadcastModule.NAME -> EventBroadcastModule(reactContext)
+      THEOliveModule.NAME -> THEOliveModule(reactContext)
+      THEOadsModule.NAME -> THEOadsModule(reactContext)
+      else -> null
+    }
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     return listOf<ViewManager<*, *>>(ReactTHEOplayerViewManager())
   }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      mapOf(
+        PlayerModule.NAME to PlayerModule.INFO,
+        AdsModule.NAME to AdsModule.INFO,
+        ContentProtectionModule.NAME to ContentProtectionModule.INFO,
+        CastModule.NAME to CastModule.INFO,
+        CacheModule.NAME to CacheModule.INFO,
+        EventBroadcastModule.NAME to EventBroadcastModule.INFO,
+        THEOliveModule.NAME to THEOliveModule.INFO,
+        THEOadsModule.NAME to THEOadsModule.INFO,
+      )
+    }
+  }
 }

package/android/src/main/java/com/theoplayer/ads/AdsModule.kt

@@ -1,10 +1,10 @@
-@file:Suppress("unused")
-
 package com.theoplayer.ads
 
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.*
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
 import com.theoplayer.source.SourceAdapter
 import com.theoplayer.util.ViewResolver
 import com.theoplayer.ReactTHEOplayerView
@@ -12,18 +12,30 @@ import com.theoplayer.android.api.ads.OmidFriendlyObstruction
 import com.theoplayer.android.api.ads.OmidFriendlyObstructionPurpose
 import com.theoplayer.android.api.error.THEOplayerException
 
-private const val TAG = "THEORCTAdsModule"
-
 private const val PROP_OMID_VIEW = "view"
 private const val PROP_OMID_PURPOSE = "purpose"
 private const val PROP_OMID_REASON = "reason"
 
+@Suppress("unused")
+@ReactModule(name = AdsModule.NAME)
 class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+  companion object {
+    const val NAME = "THEORCTAdsModule"
+    val INFO = ReactModuleInfo(
+      name = NAME,
+      className = NAME,
+      canOverrideExistingModule = false,
+      needsEagerInit = false,
+      isCxxModule = false,
+      isTurboModule = false,
+    )
+  }
+
   private val sourceHelper = SourceAdapter()
   private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
-    return TAG
+    return NAME
   }
 
   // Add an ad break request.
@@ -34,7 +46,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
         try {
           view.adsApi.schedule(sourceHelper.parseAdFromJS(ad))
         } catch (exception: THEOplayerException) {
-          Log.e(TAG, exception.message!!)
+          Log.e(NAME, exception.message!!)
         }
       }
     }

package/android/src/main/java/com/theoplayer/broadcast/EventBroadcastModule.kt

@@ -1,4 +1,3 @@
-@file:Suppress("unused")
 package com.theoplayer.broadcast
 
 import com.facebook.react.bridge.ReactApplicationContext
@@ -6,18 +5,29 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
 import com.theoplayer.ReactTHEOplayerView
 import com.theoplayer.util.ViewResolver
 
-private const val TAG = "THEORCTEventBroadcastModule"
-
-@ReactModule(name = TAG)
+@Suppress("unused")
+@ReactModule(name = EventBroadcastModule.NAME)
 class EventBroadcastModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+  companion object {
+    const val NAME = "THEORCTEventBroadcastModule"
+    val INFO = ReactModuleInfo(
+      name = NAME,
+      className = NAME,
+      canOverrideExistingModule = false,
+      needsEagerInit = false,
+      isCxxModule = false,
+      isTurboModule = false,
+    )
+  }
 
   private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
-    return TAG
+    return NAME
   }
 
   /**

package/android/src/main/java/com/theoplayer/cache/CacheAdapter.kt

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.theoplayer.android.api.cache.CacheStatus
-import com.theoplayer.android.api.cache.CacheStorageType
 import com.theoplayer.android.api.cache.CachingParameters
 import com.theoplayer.android.api.cache.CachingPreferredTrackSelection
 import com.theoplayer.android.api.cache.CachingTask
@@ -27,7 +26,6 @@ private const val PROP_PARAMETERS_BANDWIDTH = "bandwidth"
 private const val PROP_PARAMETERS_PREFERRED_TRACK_SELECTION = "preferredTrackSelection"
 private const val PROP_PARAMETERS_AUDIO_TRACK_SELECTION = "audioTrackSelection"
 private const val PROP_PARAMETERS_TEXT_TRACK_SELECTION = "textTrackSelection"
-private const val PROP_PARAMETERS_STORAGE_TYPE = "storageType"
 private const val PROP_DURATION = "duration"
 private const val PROP_CACHED = "cached"
 private const val PROP_SECONDS_CACHED = "secondsCached"
@@ -103,12 +101,6 @@ object CacheAdapter {
       if (parameters.hasKey(PROP_PARAMETERS_PREFERRED_TRACK_SELECTION)) {
         preferredTrackSelection(parsePreferredTrackSelection(parameters.getMap(PROP_PARAMETERS_PREFERRED_TRACK_SELECTION)))
       }
-      if (parameters.hasKey(PROP_PARAMETERS_STORAGE_TYPE)) {
-        storageType(when (parameters.getString(PROP_PARAMETERS_STORAGE_TYPE)) {
-          "legacy" -> CacheStorageType.LEGACY
-          else -> CacheStorageType.MEDIA3
-        })
-      }
     }.build()
   }
 
@@ -129,10 +121,6 @@ object CacheAdapter {
         putString(PROP_PARAMETERS_AMOUNT, parameters.amount)
         putDouble(PROP_PARAMETERS_BANDWIDTH, parameters.bandwidth.toDouble())
         putDouble(PROP_PARAMETERS_EXPIRATION_DATE, parameters.expirationDate.time.toDouble())
-        putString(PROP_PARAMETERS_STORAGE_TYPE, when (parameters.storageType) {
-          CacheStorageType.LEGACY -> "legacy"
-          CacheStorageType.MEDIA3 -> "media3"
-        })
       }
     }
   }

package/android/src/main/java/com/theoplayer/cache/CacheModule.kt

@@ -1,5 +1,3 @@
-@file:Suppress("unused")
-
 package com.theoplayer.cache
 
 import android.os.Handler
@@ -12,8 +10,11 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.Gson
+import com.theoplayer.ads.AdsModule
 import com.theoplayer.util.ViewResolver
 import com.theoplayer.android.api.THEOplayerGlobal
 import com.theoplayer.android.api.cache.Cache
@@ -30,8 +31,6 @@ import com.theoplayer.source.SourceAdapter
 import org.json.JSONException
 import org.json.JSONObject
 
-private const val TAG = "THEORCTCacheModule"
-
 private const val PROP_STATUS = "status"
 private const val PROP_ID = "id"
 private const val PROP_TASK = "task"
@@ -39,8 +38,22 @@ private const val PROP_TASKS = "tasks"
 private const val PROP_PROGRESS = "progress"
 private const val PROP_ERROR = "error"
 
+@Suppress("unused")
+@ReactModule(name = CacheModule.NAME)
 class CacheModule(private val context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
+  companion object {
+    const val NAME = "THEORCTCacheModule"
+    val INFO = ReactModuleInfo(
+      name = NAME,
+      className = NAME,
+      canOverrideExistingModule = false,
+      needsEagerInit = false,
+      isCxxModule = false,
+      isTurboModule = false,
+    )
+  }
+
   private val viewResolver: ViewResolver = ViewResolver(context)
   private val onTaskProgress = mutableMapOf<String, EventListener<CachingTaskProgressEvent>>()
   private val onTaskError = mutableMapOf<String, EventListener<CachingTaskErrorEvent>>()
@@ -59,7 +72,7 @@ class CacheModule(private val context: ReactApplicationContext) :
           emit("onCacheStatusChange", Arguments.createMap().apply {
             putString(PROP_STATUS, CacheAdapter.fromCacheStatus(event.status))
           })
-       }
+        }
         // Listen for add task events
         tasks.addEventListener(CachingTaskListEventTypes.ADD_TASK) { event ->
           event.task?.let { task ->
@@ -88,7 +101,7 @@ class CacheModule(private val context: ReactApplicationContext) :
   }
 
   override fun getName(): String {
-    return TAG
+    return NAME
   }
 
   private fun addCachingTaskListeners(task: CachingTask) {
@@ -233,7 +246,7 @@ class CacheModule(private val context: ReactApplicationContext) :
 
   private fun taskById(id: String): CachingTask? {
     return cache.tasks.getTaskById(id) ?: run {
-      Log.w(TAG, "CachingTask with id $id not found")
+      Log.w(NAME, "CachingTask with id $id not found")
       return null
     }
   }

package/android/src/main/java/com/theoplayer/cast/CastEventAdapter.kt

@@ -6,6 +6,7 @@ import com.theoplayer.android.api.cast.Cast
 import com.theoplayer.android.api.cast.chromecast.CastError
 import com.theoplayer.android.api.cast.chromecast.ErrorCode
 import com.theoplayer.android.api.cast.chromecast.PlayerCastState
+import com.theoplayer.android.api.event.EventListener
 import com.theoplayer.android.api.event.chromecast.CastErrorEvent
 import com.theoplayer.android.api.event.chromecast.CastStateChangeEvent
 import com.theoplayer.android.api.event.chromecast.ChromecastEventTypes
@@ -22,24 +23,27 @@ class CastEventAdapter(private val castApi: Cast, private val emitter: Emitter)
     fun emit(payload: WritableMap?)
   }
 
+  private val onCastError = EventListener<CastErrorEvent> { handleCastError(it) }
+  private val onStateChange = EventListener<CastStateChangeEvent> { handleStateChange(it) }
+
   init {
-    castApi.chromecast.addEventListener(ChromecastEventTypes.ERROR, this::onCastError)
-    castApi.chromecast.addEventListener(ChromecastEventTypes.STATECHANGE, this::onStateChange)
+    castApi.chromecast.addEventListener(ChromecastEventTypes.ERROR, onCastError)
+    castApi.chromecast.addEventListener(ChromecastEventTypes.STATECHANGE, onStateChange)
   }
 
   fun destroy() {
-    castApi.chromecast.removeEventListener(ChromecastEventTypes.ERROR, this::onCastError)
-    castApi.chromecast.removeEventListener(ChromecastEventTypes.STATECHANGE, this::onStateChange)
+    castApi.chromecast.removeEventListener(ChromecastEventTypes.ERROR, onCastError)
+    castApi.chromecast.removeEventListener(ChromecastEventTypes.STATECHANGE, onStateChange)
   }
 
-  private fun onCastError(event: CastErrorEvent) {
+  private fun handleCastError(event: CastErrorEvent) {
     val payload = Arguments.createMap()
     payload.putString(EVENT_PROP_TYPE, "chromecasterror")
     payload.putMap(EVENT_PROP_ERROR, serializeError(event.error))
     emitter.emit(payload)
   }
 
-  private fun serializeError(error: CastError): WritableMap  {
+  private fun serializeError(error: CastError): WritableMap {
     val errorPayload = Arguments.createMap()
     @Suppress("SENSELESS_NULL_IN_WHEN")
     errorPayload.putString(
@@ -62,7 +66,7 @@ class CastEventAdapter(private val castApi: Cast, private val emitter: Emitter)
     return errorPayload
   }
 
-  private fun onStateChange(event: CastStateChangeEvent) {
+  private fun handleStateChange(event: CastStateChangeEvent) {
     val payload = Arguments.createMap()
     payload.putString(EVENT_PROP_TYPE, "chromecaststatechange")
     if (event.state != null) {