Merge branch 'release/0.2.36'

chaimPaneth · Jul 3, 2023 · 64e86b8 · 64e86b8
2 parents bca8999 + ac98e7f
commit 64e86b8
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 107 deletions.
diff --git a/Example/app/jsx/components/AnimatedPlayer/index.js b/Example/app/jsx/components/AnimatedPlayer/index.js
@@ -284,7 +284,7 @@ class AnimatedPlayer extends Component {
     });
   }
 
-  isisMinimized() {
+  isCollapsed() {
     return this.state.isMinimized;
   }
 
@@ -584,7 +584,7 @@ class AnimatedPlayer extends Component {
           {...this.panResponder.panHandlers}
           style={playerStyle.subCont}>
           <TouchableWithoutFeedback
-            disabled={!this.isisMinimized()}
+            disabled={!this.isCollapsed()}
             onPress={() => {
               this.isMinimized ? this.animateUp() : null;
             }}>

diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock
@@ -78,7 +78,7 @@ PODS:
     - Protobuf (~> 3.13)
   - google-cast-sdk/Core (4.7.0):
     - Protobuf (~> 3.13)
-  - JWPlayerKit (4.9.0)
+  - JWPlayerKit (4.13.0)
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.1100)
   - Protobuf (3.21.12)
@@ -370,9 +370,9 @@ PODS:
     - React
   - RNGestureHandler (2.4.2):
     - React-Core
-  - RNJWPlayer (0.2.33):
+  - RNJWPlayer (0.2.36):
     - google-cast-sdk (~> 4.7.0)
-    - JWPlayerKit (~> 4.9.0)
+    - JWPlayerKit (~> 4.13.0)
     - React
   - RNScreens (3.13.1):
     - React-Core
@@ -571,7 +571,7 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 476ee3e89abb49e07f822b48323c51c57124b572
   google-cast-sdk: 6731e9a206ce43e0f4433d15598ad8a19f0371d5
-  JWPlayerKit: 7b4c679dc71166d7b0f39dbfa704f94834e542a2
+  JWPlayerKit: cfc3559afa6aed5314e046bce83f35973c2520db
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   Protobuf: 120350fc38646e2dedc26f49ecba778184ea1de2
@@ -606,7 +606,7 @@ SPEC CHECKSUMS:
   RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
   RNGestureHandler: 61628a2c859172551aa2100d3e73d1e57878392f
-  RNJWPlayer: 1f7766231a9e8063311f7b15b6227ecfa1ef5dee
+  RNJWPlayer: cd1846f78dc1e996fe7e93462ac140e46ca417c6
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608

diff --git a/Example/package.json b/Example/package.json
@@ -19,7 +19,7 @@
     "react-native-fs": "2.16.6",
     "react-native-gesture-handler": "2.4.2",
     "rn-iphone-helper": "2.0.0",
-    "react-native-jw-media-player": "0.2.34",
+    "react-native-jw-media-player": "0.2.36",
     "react-native-orientation-locker": "1.4.0",
     "react-native-safe-area-context": "4.2.5",
     "react-native-screens": "3.13.1",

diff --git a/Example/yarn.lock b/Example/yarn.lock
@@ -6304,10 +6304,10 @@ react-native-gradle-plugin@^0.0.6:
   resolved "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.6.tgz"
   integrity sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg==
 
-[email protected].33:
-  version "0.2.33"
-  resolved "https://registry.yarnpkg.com/react-native-jw-media-player/-/react-native-jw-media-player-0.2.33.tgz#ce2333088e5d8587a4176d39ea0ff231919561db"
-  integrity sha512-AXvnHBa6H69rQlNgJuDKrt4p+0bDgLEgNC7Q0X4zL2aQ6EeN/lh0mue4WvthsobDmG/+GHxFQtbjqEtMeQeY9w==
+[email protected].36:
+  version "0.2.36"
+  resolved "https://registry.yarnpkg.com/react-native-jw-media-player/-/react-native-jw-media-player-0.2.36.tgz#14ef5777d7b11cb98c22e74c922c35f90a63be9e"
+  integrity sha512-RUTaoM9kLeUjeC4//wOOUR4YcNegp8Tsqy5xJoSTa/94zNVjtxlWYcDsnTziHtt+pUpuip8JzhvUHudvOs4pRQ==
 
 [email protected]:
   version "1.4.0"

diff --git a/RNJWPlayer.podspec b/RNJWPlayer.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "12.0"
   s.source       = { :git => "https://github.com/chaimPaneth/react-native-jw-media-player.git", :tag => "v#{s.version}" }
   s.source_files  = "ios/RNJWPlayer/*.{h,m}"
-  s.dependency   'JWPlayerKit', '~> 4.10.0'
+  s.dependency   'JWPlayerKit', '~> 4.13.0'
   s.dependency   'google-cast-sdk', '~> 4.7.0'
   s.dependency   'React'
   # s.static_framework = true

diff --git a/android/build.gradle b/android/build.gradle
@@ -29,7 +29,7 @@ android {
         }
     }
     lintOptions {
-       warning 'InvalidPackage'
+        warning 'InvalidPackage'
     }
 }
 
@@ -48,34 +48,39 @@ allprojects {
     }
 }
 
+def jwPlayerVersion = "4.12.0"
+def exoplayerVersion = "2.18.7"
+
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     // JWPlayer SDK
-    implementation "com.jwplayer:jwplayer-core:${safeExtGet('jwPlayerVersion', '4.6.1')}"
-    implementation "com.jwplayer:jwplayer-common:${safeExtGet('jwPlayerVersion', '4.6.1')}"
-    implementation "com.jwplayer:jwplayer-chromecast:${safeExtGet('jwPlayerVersion', '4.6.1')}"
-    implementation "com.jwplayer:jwplayer-ima:${safeExtGet('jwPlayerVersion', '4.6.1')}"
+    implementation "com.jwplayer:jwplayer-core:${safeExtGet('jwPlayerVersion', jwPlayerVersion)}"
+    implementation "com.jwplayer:jwplayer-common:${safeExtGet('jwPlayerVersion', jwPlayerVersion)}"
+    implementation "com.jwplayer:jwplayer-chromecast:${safeExtGet('jwPlayerVersion', jwPlayerVersion)}"
+    implementation "com.jwplayer:jwplayer-ima:${safeExtGet('jwPlayerVersion', jwPlayerVersion)}"
 
     // Ad dependencies
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.27.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.29.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
-    implementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+    implementation 'com.google.android.gms:play-services-cast-framework:21.3.0'
 
     // ExoPlayer dependencies
-    implementation "com.google.android.exoplayer:exoplayer-core:${safeExtGet('exoplayerVersion', '2.16.1')}"
-    implementation "com.google.android.exoplayer:exoplayer-dash:${safeExtGet('exoplayerVersion', '2.16.1')}"
-    implementation "com.google.android.exoplayer:exoplayer-hls:${safeExtGet('exoplayerVersion', '2.16.1')}"
-    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${safeExtGet('exoplayerVersion', '2.16.1')}"
-    implementation "com.google.android.exoplayer:exoplayer-ui:${safeExtGet('exoplayerVersion', '2.16.1')}"
+    implementation "com.google.android.exoplayer:exoplayer-core:${safeExtGet('exoplayerVersion', exoplayerVersion)}"
+    implementation "com.google.android.exoplayer:exoplayer-dash:${safeExtGet('exoplayerVersion', exoplayerVersion)}"
+    implementation "com.google.android.exoplayer:exoplayer-hls:${safeExtGet('exoplayerVersion', exoplayerVersion)}"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${safeExtGet('exoplayerVersion', exoplayerVersion)}"
+    implementation "com.google.android.exoplayer:exoplayer-ui:${safeExtGet('exoplayerVersion', exoplayerVersion)}"
 
     // JW Player Native UI dependencies
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'com.android.volley:volley:1.2.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.mediarouter:mediarouter:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.mediarouter:mediarouter:1.4.0'
     implementation 'androidx.media:media:1.6.0'
+
+    implementation project(':react-native-android-media-browser')
 }
 
diff --git a/ios/RNJWPlayer/RNJWPlayerView.h b/ios/RNJWPlayer/RNJWPlayerView.h
@@ -28,9 +28,17 @@
 @property(nonatomic)JWInterfaceBehavior interfaceBehavior;
 
 /* DRM props */
-@property(nonatomic) NSString *fairplayCertUrl;
-@property(nonatomic) NSString *processSpcUrl;
-@property(nonatomic) NSString *contentUUID;
+@property(nonatomic)NSString *fairplayCertUrl;
+@property(nonatomic)NSString *processSpcUrl;
+@property(nonatomic)NSString *contentUUID;
+
+/* Config helpers */
+@property(nonatomic)NSString *audioCategory;
+@property(nonatomic)NSString *audioMode;
+@property(nonatomic, strong)NSArray* audioCategoryOptions;
+@property(nonatomic)BOOL settingConfig;
+@property(nonatomic)BOOL pendingConfig;
+@property(nonatomic)NSDictionary* currentConfig;
 
 /* casting objects */
 @property(nonatomic, strong)JWCastController *castController;
@@ -106,5 +114,6 @@
 -(void)startDeinitProcess;
 -(JWPlayerItem*)getPlayerItem:item;
 - (void)setVisibility:(BOOL)isVisible forControls:(NSArray* _Nonnull)controls;
+- (void)setConfig:(NSDictionary*)config;
 
 @end