Merge pull request #376 from THEOplayer/release/7.9.0

Release/7.9.0
THEOplayer · Sep 6, 2024 · 9e5a370 · 9e5a370
2 parents d85c6f1 + 0be1100
commit 9e5a370
Show file tree

Hide file tree

Showing 20 changed files with 389 additions and 249 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ 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).
 
+## [7.9.0] - 24-09-06
+
+### Added
+
+- Added THEOlive source integration type to `SourceDescription`.
+- Added THEOads as `AdIntegrationKind`.
+- Added a `headers` property to `TypedSource`. The player will add the headers to the HTTP requests for the given resource.
+
 ## [7.8.2] - 24-08-21
 
 ### Changed

diff --git a/android/build.gradle b/android/build.gradle
@@ -112,9 +112,9 @@ dependencies {
   implementation "androidx.appcompat:appcompat:${safeExtGet('appcompatVersion', '1.6.1')}"
   implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.10.1')}"
 
-  // The minimum supported THEOplayer version is 7.6.0
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[7.10.0, 8.0.0)')
-  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[7.10.0, 8.0.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)')
 
   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
@@ -51,6 +51,7 @@ private const val PROP_POSTER = "poster"
 private const val PROP_ADS = "ads"
 private const val PROP_DASH = "dash"
 private const val PROP_DASH_IGNORE_AVAILABILITYWINDOW = "ignoreAvailabilityWindow"
+private const val PROP_HEADERS = "headers"
 private const val ERROR_IMA_NOT_ENABLED = "Google IMA support not enabled."
 private const val ERROR_UNSUPPORTED_CSAI_INTEGRATION = "Unsupported CSAI integration"
 private const val ERROR_MISSING_CSAI_INTEGRATION = "Missing CSAI integration"
@@ -151,6 +152,13 @@ class SourceAdapter {
       if (jsonTypedSource.has(PROP_DASH)) {
         tsBuilder.dash(parseDashConfig(jsonTypedSource.getJSONObject(PROP_DASH)))
       }
+      jsonTypedSource.optJSONObject(PROP_HEADERS)?.let { headersJson ->
+        tsBuilder.headers(mutableMapOf<String, String>().apply {
+          headersJson.keys().forEach { key ->
+            put(key, headersJson.getString(key))
+          }
+        })
+      }
       if (jsonTypedSource.has(PROP_LIVE_OFFSET)) {
         tsBuilder.liveOffset(jsonTypedSource.getDouble(PROP_LIVE_OFFSET))
       }

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.10.0, 8.0.0)
+#THEOplayer_sdk=[7.12.0, 8.0.0)
 
 # Override Android sdk versions
 #THEOplayer_compileSdkVersion = 34

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -953,14 +953,14 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-theoplayer (7.7.0):
+  - react-native-theoplayer (7.9.0):
     - google-cast-sdk-dynamic-xcframework (~> 4.8)
     - React-Core
-    - THEOplayer-Connector-SideloadedSubtitle (~> 7.8)
-    - THEOplayer-Integration-GoogleCast/Base (~> 7.8)
-    - THEOplayer-Integration-GoogleIMA/Base (~> 7.8)
-    - THEOplayer-Integration-GoogleIMA/Dependencies (~> 7.8)
-    - THEOplayerSDK-core (~> 7.8)
+    - THEOplayer-Connector-SideloadedSubtitle (~> 7.12)
+    - THEOplayer-Integration-GoogleCast/Base (~> 7.12)
+    - THEOplayer-Integration-GoogleIMA/Base (~> 7.12)
+    - THEOplayer-Integration-GoogleIMA/Dependencies (~> 7.12)
+    - THEOplayerSDK-core (~> 7.12)
   - React-nativeconfig (0.74.1-0)
   - React-NativeModulesApple (0.74.1-0):
     - glog
@@ -1190,16 +1190,16 @@ PODS:
   - SwiftSubtitles (0.9.1):
     - DSFRegex (~> 3.3.1)
     - TinyCSV (~> 0.6.1)
-  - THEOplayer-Connector-SideloadedSubtitle (7.8.0):
+  - THEOplayer-Connector-SideloadedSubtitle (7.12.0):
     - Swifter (= 1.5.0)
     - SwiftSubtitles (= 0.9.1)
-    - THEOplayerSDK-core (~> 7)
-  - THEOplayer-Integration-GoogleCast/Base (7.8.0)
-  - THEOplayer-Integration-GoogleIMA/Base (7.8.0)
-  - THEOplayer-Integration-GoogleIMA/Dependencies (7.8.0):
+    - THEOplayerSDK-core (~> 7.10)
+  - THEOplayer-Integration-GoogleCast/Base (7.12.0)
+  - THEOplayer-Integration-GoogleIMA/Base (7.12.0)
+  - THEOplayer-Integration-GoogleIMA/Dependencies (7.12.0):
     - GoogleAds-IMA-iOS-SDK (~> 3.18)
     - GoogleAds-IMA-tvOS-SDK (~> 4.8)
-  - THEOplayerSDK-core (7.8.0)
+  - THEOplayerSDK-core (7.12.0)
   - TinyCSV (0.6.1)
   - Yoga (0.0.0)
 
@@ -1441,7 +1441,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: e1da272870606f17a64520bf78d85e1b73bb0778
   react-native-google-cast: d7bdfd1a0eeba84afde03b9722351ec29543e74c
   react-native-slider: 315e6552460f5d7753c71cf3142b00161cb2d5a5
-  react-native-theoplayer: cf37bf1729a4e0db65d56c592d2b6793aaf97346
+  react-native-theoplayer: 89adf55885db50bebb334a35ef2ce7b495b0f332
   React-nativeconfig: 0e309fafbbfbb8eac2f1999d0756732624ac5b39
   React-NativeModulesApple: a53141b07c57c53cdc1f2043e5acf3b9318bc340
   React-perflogger: e4f171200bc71bb8cf0686a0ad41a242f53b6b36
@@ -1468,10 +1468,10 @@ SPEC CHECKSUMS:
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Swifter: e71dd674404923d7f03ebb03f3f222d1c570bc8e
   SwiftSubtitles: c659af19d710a2946779015464c0577d07fe4666
-  THEOplayer-Connector-SideloadedSubtitle: a458ce38a5d686dccc5acdf9bf3edc312ab70cd3
-  THEOplayer-Integration-GoogleCast: 345adf295f90a8ab78ba77c3e1eff251c5447109
-  THEOplayer-Integration-GoogleIMA: c8281e46454d152095410bbe994a31b0e55834b8
-  THEOplayerSDK-core: d8551e4b9f38c73503a91b778df4c0412ddfadd1
+  THEOplayer-Connector-SideloadedSubtitle: d85e580211d4327be7ed8faf0633bcd6401f38dd
+  THEOplayer-Integration-GoogleCast: c4d49b120b05005a90b03fff6d711ef0300b64a1
+  THEOplayer-Integration-GoogleIMA: 64505e6feee971c0ebec3ab4ab14296e009a290c
+  THEOplayerSDK-core: b162d868db9229c3c9bc6f2e2e2ba0edab47035b
   TinyCSV: fd6228edbcf1c07466ac34b76dac5e052143eaba
   Yoga: d84d1e521e3f8fa3cdd139d617ddf6514d061c78