diff --git a/android/build.gradle b/android/build.gradle index a113bdb28..8fb77658e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,37 +1,54 @@ -import java.nio.file.Paths - buildscript { - ext.getExtOrDefault = {name, fallback -> - return rootProject.ext.has(name) ? rootProject.ext.get(name) : fallback - } + ext.getExtOrDefault = {name, fallback -> + return rootProject.ext.has(name) ? rootProject.ext.get(name) : fallback + } - repositories { - google() - mavenCentral() - maven { url 'https://central.sonatype.com/repository/maven-snapshots/' } - } - - dependencies { - classpath("com.android.tools.build:gradle:7.3.1") - // noinspection DifferentKotlinGradleVersion - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion', '1.8.10')}" - } + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("com.android.tools.build:gradle:7.3.1") + // noinspection DifferentKotlinGradleVersion + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion', '1.8.10')}" + } } apply plugin: "com.android.library" apply plugin: "kotlin-android" +rootProject.allprojects { + repositories { + maven { + name = 'Central Portal Snapshots' + url = 'https://central.sonatype.com/repository/maven-snapshots/' + content { + // This efficiently tells Gradle to only look for this specific dependency here + includeModule('io.getstream', 'stream-webrtc-android') + } + } + } +} + +repositories { + mavenCentral() + google() +} + + + def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } def supportsNamespace() { - def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.') - def major = parsed[0].toInteger() - def minor = parsed[1].toInteger() + def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.') + def major = parsed[0].toInteger() + def minor = parsed[1].toInteger() - // Namespace support was added in 7.3.0 - return (major == 7 && minor >= 3) || major >= 8 + // Namespace support was added in 7.3.0 + return (major == 7 && minor >= 3) || major >= 8 } android { @@ -63,9 +80,13 @@ android { } } +def kotlin_version = getExtOrDefault('kotlinVersion', '1.8.10') + +println "Building Stream WebRTC React Native module with Kotlin version: $kotlin_version" + dependencies { - api 'io.getstream:stream-webrtc-android:1.3.9' + api 'io.getstream:stream-webrtc-android:1.3.10-SNAPSHOT' implementation 'com.facebook.react:react-native:+' - implementation "org.jetbrains.kotlin:kotlin-stdlib:${getExtOrDefault('kotlinVersion', '1.8.10')}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "androidx.core:core:1.7.0" } diff --git a/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java b/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java index 012cd7929..d93f9bdea 100644 --- a/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java +++ b/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java @@ -123,6 +123,10 @@ public String getName() { return "WebRTCModule"; } + public AudioDeviceModule getAudioDeviceModule() { + return mAudioDeviceModule; + } + private PeerConnection getPeerConnection(int id) { PeerConnectionObserver pco = mPeerConnectionObservers.get(id); return (pco == null) ? null : pco.getPeerConnection(); diff --git a/package-lock.json b/package-lock.json index 0d0718523..6b5a49852 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@stream-io/react-native-webrtc", - "version": "125.4.3", + "version": "125.4.4-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@stream-io/react-native-webrtc", - "version": "125.4.3", + "version": "125.4.4-alpha.1", "license": "MIT", "dependencies": { "base64-js": "1.5.1", diff --git a/package.json b/package.json index 610029718..5b358abd5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@stream-io/react-native-webrtc", - "version": "125.4.3", + "version": "125.4.4-alpha.1", "repository": { "type": "git", "url": "git+https://github.com/GetStream/react-native-webrtc.git"