Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.0.13
17.0.16
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.webkit.URLUtil
import androidx.annotation.RequiresApi
import com.facebook.react.bridge.*
import com.facebook.react.uimanager.events.RCTEventEmitter
import hms.webrtc.SurfaceViewRenderer
import live.hms.video.audio.HMSAudioManager
import live.hms.video.error.HMSException
import live.hms.video.events.AgentType
Expand All @@ -27,7 +28,6 @@ import live.hms.video.sdk.models.role.HMSRole
import live.hms.video.services.LogAlarmManager
import live.hms.video.utils.HMSLogger
import live.hms.video.utils.HmsUtilities
import org.webrtc.SurfaceViewRenderer
import java.io.ByteArrayOutputStream
import java.util.*
import kotlin.collections.ArrayList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import com.facebook.react.bridge.ReactContext
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.WritableMap
import com.facebook.react.uimanager.events.RCTEventEmitter
import hms.webrtc.RendererCommon
import live.hms.video.media.tracks.HMSVideoTrack
import live.hms.video.utils.HmsUtilities
import live.hms.videoview.HMSVideoView
import live.hms.videoview.VideoViewStateChangeListener
import org.webrtc.RendererCommon

@SuppressLint("ViewConstructor")
class HMSView(
Expand Down
78 changes: 12 additions & 66 deletions packages/react-native-hms/example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/react-native-hms/example/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNHMSExample",
"version": "1.11.1",
"version": "1.12.0",
"private": true,
"scripts": {
"preinstall": "cd ../ && npm install && cd ./example",
Expand All @@ -24,7 +24,7 @@
"react-native-device-info": "^9.0.2",
"react-native-document-picker": "^8.1.1",
"react-native-fs": "^2.19.0",
"react-native-gesture-handler": "^1.10.3",
"react-native-gesture-handler": "^2.28.0",
"react-native-modal": "^12.1.0",
"react-native-permissions": "3.4.0",
"react-native-qrcode-scanner": "^1.5.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-hms/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-native-hms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@100mslive/react-native-hms",
"version": "1.11.1",
"version": "1.12.0",
"description": "Integrate Real Time Audio and Video conferencing, Interactive Live Streaming, and Chat in your apps with 100ms React Native SDK. With support for HLS and RTMP Live Streaming and Recording, Picture-in-Picture (PiP), one-to-one Video Call Modes, Audio Rooms, Video Player and much more, add immersive real-time communications to your apps.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native-hms/sdk-versions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ios": "1.16.5",
"iOSBroadcastExtension": "0.0.9",
"ios": "1.17.0",
"iOSBroadcastExtension": "1.0.1",
"iOSHMSHLSPlayer": "0.0.2",
"iOSNoiseCancellationModels": "1.0.0",
"android": "2.9.69"
"android": "2.9.78"
}
33 changes: 29 additions & 4 deletions packages/react-native-room-kit/example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: "com.android.application"
apply plugin: "com.facebook.react"
apply plugin: "kotlin-android"

import com.android.build.OutputFile

Expand Down Expand Up @@ -93,6 +94,15 @@ android {

compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
buildConfig true
}

namespace "live.hms.rn"
defaultConfig {
applicationId "live.hms.rn"
Expand Down Expand Up @@ -143,8 +153,10 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
packagingOptions {
pickFirst '**/*.so'
packaging {
jniLibs {
pickFirst '**/*.so'
}
}
// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
Expand All @@ -163,11 +175,24 @@ android {
}
}

configurations.all {
resolutionStrategy {
force "androidx.activity:activity:1.9.3"
force "androidx.activity:activity-ktx:1.9.3"
force "androidx.core:core:1.15.0"
force "androidx.core:core-ktx:1.15.0"
}
}

dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")

implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("androidx.activity:activity:1.9.3")
implementation("androidx.activity:activity-ktx:1.9.3")
implementation("androidx.core:core:1.15.0")
implementation("androidx.core:core-ktx:1.15.0")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
Expand All @@ -177,10 +202,10 @@ dependencies {
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}
Expand Down
79 changes: 73 additions & 6 deletions packages/react-native-room-kit/example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,90 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

// Apply Kotlin compiler arguments globally before any compilation
gradle.projectsEvaluated {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
}
}

buildscript {
ext {
buildToolsVersion = "34.0.0"
buildToolsVersion = "35.0.0"
minSdkVersion = 21
compileSdkVersion = 34
targetSdkVersion = 34
compileSdkVersion = 35
targetSdkVersion = 35

ndkVersion = "26.1.10909125"

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
kotlinVersion = "2.0.0"
kotlinGradlePluginVersion = "2.0.0"
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.4.2")
classpath("com.android.tools.build:gradle:8.5.2")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

subprojects {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-Xskip-metadata-version-check"]
jvmTarget = "17"
apiVersion = "2.0"
languageVersion = "2.0"
}
}
}

allprojects {
afterEvaluate { project ->
if (project.hasProperty("kotlin")) {
project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-Xskip-metadata-version-check"]
jvmTarget = "17"
apiVersion = "2.0"
languageVersion = "2.0"
}
}
}

// Enable buildConfig and set namespace for all Android modules in AGP 8.x
if (project.hasProperty("android")) {
project.android {
if (it.hasProperty("buildFeatures")) {
buildFeatures {
buildConfig = true
}
}

// Set namespace if not already set
if (!it.namespace) {
def manifestFile = project.file("src/main/AndroidManifest.xml")
if (manifestFile.exists()) {
def manifest = new groovy.xml.XmlParser().parse(manifestFile)
def packageName = manifest.@package
if (packageName) {
it.namespace = packageName
}
}
}

// Set Java compatibility to match Kotlin JVM target
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}
}
}
}
Loading
Loading