react-native-theoplayer 9.9.1 → 10.0.0

package/CHANGELOG.md

@@ -5,6 +5,30 @@ 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.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
+
+- Fixed an issue on Android where transitioning into picture-in-picture presentation mode with the `THEOplayer_reparent_on_PiP` flag enabled would sometimes break the lay-out.
+- Fixed an issue where the player's `currentTime` would not be immediately updated when dispatching `seeking` and `seeked` events.
+- Fixed an issue on iOS where a listener for `seeked` events was not properly created.
+
 ## [9.9.1] - 25-07-31
 
 ### Fixed
@@ -18,7 +42,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Added support for Clearkey DRM on Android.
 - Added `endpoint` property to THEOlive `EndpointLoaded` event.
-- Added support for ABRStrategyConfiguration on iOS 
+- Added support for `ABRStrategyConfiguration` on iOS.
 
 ## [9.9.0] - 25-07-14
 

package/README.md

@@ -145,8 +145,11 @@ functionality. Currently, the following connectors are available:
 | Agama analytics                                           | [![%40theoplayer/react-native-analytics-agama](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-agama?label=%40theoplayer/react-native-analytics-agama)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-agama)                | [`Agama`](https://github.com/THEOplayer/react-native-connectors/tree/main/agama)                 |
 | Comscore analytics                                        | [![%40theoplayer/react-native-analytics-comscore](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-comscore?label=%40theoplayer/react-native-analytics-comscore)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-comscore)    | [`Comscore`](https://github.com/THEOplayer/react-native-connectors/tree/main/comscore)           |
 | Conviva analytics                                         | [![%40theoplayer/react-native-analytics-conviva](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-conviva?label=%40theoplayer/react-native-analytics-conviva)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-conviva)        | [`Conviva`](https://github.com/THEOplayer/react-native-connectors/tree/main/conviva)             |
+| Engage                                                    | [![%40theoplayer/react-native-engage](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-engage?label=%40theoplayer/react-native-engage)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-engage)                                                    | [`Engage`](https://github.com/THEOplayer/react-native-connectors/tree/main/engage)               |
+| Gemius                                                    | [![%40theoplayer/react-native-analytics-gemius](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-gemius?label=%40theoplayer/react-native-analytics-gemius)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-gemius)            | [`Gemius`](https://github.com/THEOplayer/react-native-connectors/tree/main/gemius)               |
 | Mux analytics                                             | [![%40theoplayer/react-native-analytics-mux](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-mux?label=%40theoplayer/react-native-analytics-mux)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-mux)                        | [`Mux`](https://github.com/THEOplayer/react-native-connectors/tree/main/mux)                     |
 | Nielsen analytics                                         | [![%40theoplayer/react-native-analytics-nielsen](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-nielsen?label=%40theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-nielsen)        | [`Nielsen`](https://github.com/THEOplayer/react-native-connectors/tree/main/nielsen)             |
+| Nielsen AdScript analytics                                | [![%40theoplayer/react-native-analytics-adscript](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-adscript?label=%40theoplayer/react-native-analytics-adscript)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-adscript)    | [`AdScript`](https://github.com/THEOplayer/react-native-connectors/tree/main/adscript)           |
 | Youbora analytics                                         | [![%40theoplayer/react-native-analytics-youbora](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-youbora?label=%40theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-youbora)        | [`Youbora`](https://github.com/THEOplayer/react-native-connectors/tree/main/youbora)             |
 | Yospace SSAI                                              | [![%40theoplayer/react-native-yospace](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-yospace?label=%40theoplayer/react-native-yospace)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-yospace)                                                | [`Yospace`](https://github.com/THEOplayer/react-native-connectors/tree/main/yospace)             |
 | Content protection (DRM)                                  | [![%40theoplayer/react-native-drm](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-drm?label=%40theoplayer/react-native-drm)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-drm)                                                                | [`DRM`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               |
@@ -180,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')}"
     }
 }
 
@@ -47,7 +47,7 @@ android {
     namespace "com.theoplayer"
 
     defaultConfig {
-        minSdkVersion safeExtGet('THEOplayer_minSdkVersion', 21)
+        minSdkVersion safeExtGet('THEOplayer_minSdkVersion', 23)
         targetSdkVersion safeExtGet('THEOplayer_targetSdkVersion', 35)
         versionCode 1
         versionName "1.0"
@@ -125,15 +125,15 @@ repositories {
 }
 
 // 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"
+def theoVersion = safeExtGet('THEOplayer_sdk', '[9.9.0, 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')
+def millicastVersion = safeExtGet('millicastVersion', '2.5.0')
 
 dependencies {
     def addOptiViewIntegration = { enabled, notation, additional = null ->

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/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,6 +79,7 @@ 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"
@@ -120,6 +123,7 @@ class PlayerEventEmitter internal constructor(
     EVENT_AD_EVENT,
     EVENT_CAST_EVENT,
     EVENT_THEOLIVE_EVENT,
+    EVENT_THEOADS_EVENT,
     EVENT_PRESENTATIONMODECHANGE,
     EVENT_VOLUMECHANGE,
     EVENT_RESIZE
@@ -155,6 +159,7 @@ class PlayerEventEmitter internal constructor(
       EVENT_AD_EVENT,
       EVENT_CAST_EVENT,
       EVENT_THEOLIVE_EVENT,
+      EVENT_THEOADS_EVENT,
       EVENT_PRESENTATIONMODECHANGE,
       EVENT_VOLUMECHANGE,
       EVENT_RESIZE
@@ -169,6 +174,7 @@ 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 ->
@@ -614,7 +620,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 +628,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,6 +690,15 @@ 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)
   }
@@ -726,5 +742,6 @@ class PlayerEventEmitter internal constructor(
     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/CastModule.kt

@@ -1,5 +1,3 @@
-@file:Suppress("unused")
-
 package com.theoplayer.cast
 
 import com.facebook.react.bridge.ReactApplicationContext
@@ -7,14 +5,30 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.theoplayer.util.ViewResolver
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
 import com.theoplayer.ReactTHEOplayerView
 import com.theoplayer.android.api.cast.chromecast.PlayerCastState
 
+@Suppress("unused")
+@ReactModule(name = CastModule.NAME)
 class CastModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+  companion object {
+    const val NAME = "THEORCTCastModule"
+    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 "THEORCTCastModule"
+    return NAME
   }
 
   @ReactMethod

package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt

@@ -165,7 +165,7 @@ object ContentProtectionAdapter {
       if (widevine != null) {
         putMap(PROP_WIDEVINE, Arguments.createMap().apply {
           putString(PROP_LA_URL, widevine.licenseAcquisitionURL)
-          putBoolean(PROP_USE_CREDENTIALS, widevine.isUseCredentials)
+          putBoolean(PROP_USE_CREDENTIALS, widevine.useCredentials)
         })
       }
     }