Merge pull request #15 from kaltura/FEC-12022

kaltura · Nov 9, 2022 · ff357bd · ff357bd
2 parents 5b76390 + f85c38b
commit ff357bd
Show file tree

Hide file tree

Showing 63 changed files with 3,543 additions and 1,895 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -19,6 +19,11 @@ buildscript {
 android {
   compileSdkVersion 31
 
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion 30
@@ -31,7 +36,7 @@ dependencies {
 
   implementation fileTree(dir: "libs", include: ["*.jar"])
 
-  def kalturaPlayerVersion = '4.24.0'
+  def kalturaPlayerVersion = '4.24.1'
 
   implementation "com.kaltura.player:tvplayer:$kalturaPlayerVersion"
   implementation "com.kaltura.playkit:vrplugin:$kalturaPlayerVersion"
@@ -60,8 +65,14 @@ dependencies {
   }
 }
 
+def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
 
 allprojects {
+  configurations.all {
+    resolutionStrategy {
+      force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+    }
+  }
   repositories {
     google()
 

diff --git a/android/src/main/java/com/reactnativekalturaplayer/KalturaPlayerModule.kt b/android/src/main/java/com/reactnativekalturaplayer/KalturaPlayerModule.kt
@@ -35,6 +35,7 @@ class KalturaPlayerModule(
     @ReactMethod
     fun setUpPlayer(playerType: String, partnerId: Int = 0, initOptions: String?, promise: Promise) {
         log.d("setPartnerId: $partnerId")
+        checkArguments(this::setUpPlayer.name, playerType)
         kalturaPlayerRN.createPlayerInstance(getKalturaPlayerType(playerType), partnerId, initOptions, promise)
     }
 
@@ -45,7 +46,6 @@ class KalturaPlayerModule(
                     "\n , mediaAssetJson:" + mediaAsset
         )
         checkArguments(this::load.name, assetId)
-        checkArguments(this::load.name, mediaAsset)
         kalturaPlayerRN.load(assetId, mediaAsset, promise)
     }
 
@@ -248,6 +248,12 @@ class KalturaPlayerModule(
         kalturaPlayerRN.requestThumbnailInfo(positionMs, promise)
     }
 
+    @ReactMethod
+    fun setLogLevel(logLevel: String) {
+        log.d("setLogLevel $logLevel")
+        kalturaPlayerRN.setLogLevel(logLevel)
+    }
+
     @Throws(IllegalArgumentException::class)
     @NonNull
     private fun checkArguments(methodName: String, arg: String?) {