amazon-ivs-react-native-player 1.5.1-rc.1 → 1.6.0

package/AmazonIvs.podspec

@@ -0,0 +1,22 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "AmazonIvs"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/aws/amazon-ivs-react-native-player.git", :tag => "#{s.version}" }
+
+
+  s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
+  s.private_header_files = "ios/**/*.h"
+
+  s.dependency "AmazonIVSPlayer", "1.46.0"
+  install_modules_dependencies(s)
+end

package/README.md

@@ -1,6 +1,9 @@
 # Amazon IVS React Native Player
 
-This package implements native binding for Amazon IVS Player for iOS and Android.
+This package implements native binding for Amazon IVS Player for iOS and Android Mobile Only. 
+| Android Mobile | iOS | Android TV | tvOS |
+| :-----: | :-: | :---: | :-: |
+|   SDK >= 24    | >= 15.1  |  **X**   | **X**   |
 
 ## Installation
 

package/android/build.gradle

@@ -1,33 +1,30 @@
 import groovy.json.JsonSlurper
 
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['AmazonIvs_kotlinVersion']
+  ext.getExtOrDefault = { name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['AmazonIvs_' + name]
+  }
 
   repositories {
     google()
     mavenCentral()
-    google()
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:7.0.4")
-    classpath("com.facebook.react:react-native-gradle-plugin")
-    classpath("de.undercouch:gradle-download-task:4.1.2")
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['AmazonIvs_' + name]
-}
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['AmazonIvs_' + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["AmazonIvs_" + name]).toInteger()
 }
 
 def rootPkg = file('../package.json')
@@ -35,102 +32,65 @@ def pkgData = new JsonSlurper().parseText(rootPkg.text)
 def sdk_version = pkgData.version
 
 android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
+  namespace "com.amazonaws.ivs.reactnative.player"
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
   defaultConfig {
-    minSdkVersion 21
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     versionName sdk_version
-    manifestPlaceholders = [sdkVersion:sdk_version]
+    manifestPlaceholders = [sdkVersion: sdk_version]
   }
+
+  packaging {
+    resources {
+      it.pickFirsts.add("**/libfbjni.so")
+      it.pickFirsts.add("**/libc++_shared.so")
+    }
+  }
+
+  buildFeatures {
+    buildConfig true
+  }
+
   buildTypes {
     release {
       minifyEnabled false
     }
   }
+
   lintOptions {
-    disable 'GradleCompatible'
+    disable "GradleCompatible"
   }
-}
-
-repositories {
-  mavenCentral()
-  google()
 
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
-    )
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
     }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
   }
+}
 
-  if (!found) {
-    throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                    "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
+repositories {
+  mavenCentral()
+  google()
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
+def kotlin_version = getExtOrDefault("kotlinVersion")
 def ivs_version = getExtOrDefault('ivsVersion')
 
 dependencies {
-  // noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:+'
+  implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "com.amazonaws:ivs-player:$ivs_version"
-  implementation "com.squareup.okhttp3:okhttp:4.2.2"
+  implementation("com.squareup.okhttp3:okhttp:5.2.1")
+  implementation "androidx.media:media:1.6.0"
 }

package/android/gradle.properties

@@ -1,5 +1,6 @@
-AmazonIvs_kotlinVersion=1.6.10
-AmazonIvs_compileSdkVersion=31
-AmazonIvs_buildToolsVersion=31.0.0
-AmazonIvs_targetSdkVersion=31
-AmazonIvs_ivsVersion=1.25.0-rc.2
+AmazonIvs_kotlinVersion=2.1.20
+AmazonIvs_minSdkVersion=24
+AmazonIvs_targetSdkVersion=36
+AmazonIvs_compileSdkVersion=36
+AmazonIvs_ndkVersion=27.1.12297006
+AmazonIvs_ivsVersion=1.46.0

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.amazonaws.ivs.reactnative.player">
+  package="com.amazonaws.ivs.reactnative.player">
+
   <application>
     <meta-data
       android:name="com.amazonaws.ivs.player.FRAMEWORK_NAME"
@@ -7,5 +8,10 @@
     <meta-data
       android:name="com.amazonaws.ivs.player.FRAMEWORK_VERSION"
       android:value="${sdkVersion}" />
+
+    <service
+      android:name="com.amazonaws.ivs.reactnative.player.IVSBackgroundService"
+      android:exported="false"
+      android:foregroundServiceType="mediaPlayback" />
   </application>
 </manifest>

package/android/src/main/java/com/amazonaws/ivs/reactnative/player/AmazonIvsPackage.kt

@@ -6,11 +6,11 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
 class AmazonIvsPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return emptyList()
-    }
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return emptyList()
+  }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-      return listOf<ViewManager<*, *>>(AmazonIvsViewManager())
-    }
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return listOf<ViewManager<*, *>>(AmazonIvsViewManager())
+  }
 }