Merge pull request #59 from QuickBlox/develop

WebRTC sample 1.1.1

Author: IlliaChemolosov

.DS_Store

@@ -42,6 +42,9 @@ buck-out/
 *.keystore
 !debug.keystore
 
+# LOCK
+package-lock.json
+
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
@@ -58,3 +61,4 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
+/ios/Podfile.lock

webrtc-sample/.gitignore

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "com.facebook.react"
 
 import com.android.build.OutputFile
 
@@ -73,11 +74,9 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    enableHermes: true,  // clean and rebuild if changing
+    enableHermes: false,  // clean and rebuild if changing
 ]
 
-apply from: "../../node_modules/react-native/react.gradle"
-
 /**
  * Set this to true to create two separate APKs instead of one:
  *   - An APK that only works on ARM devices
@@ -167,32 +166,26 @@ android {
     }
   }
 
-  // applicationVariants are e.g. debug, release
-  applicationVariants.all { variant ->
-    variant.outputs.each { output ->
-      // For each separate APK per architecture, set a unique version code as described here:
-      // https://developer.android.com/studio/build/configure-apk-splits.html
-      // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
-      def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
-      def abi = output.getFilter(OutputFile.ABI)
-      if (abi != null) {  // null for the universal-debug, universal-release variants
-        output.versionCodeOverride =
-          defaultConfig.versionCode * 1000 + versionCodes.get(abi)
-      }
-
-    }
+  configurations {
+    all*.exclude group: "com.facebook.react", module: "react-native"
+//    all*.exclude group: "com.facebook.hermes", module: "hermes-engine"
   }
 }
 
 dependencies {
+  implementation "com.facebook.react:react-android"
+
+// Hermes
+//  implementation ("com.facebook.react:hermes-android") {
+//    exclude group: "com.facebook.hermes", module: "hermes-engine"
+//  }
+
   implementation fileTree(dir: "libs", include: ["*.jar"])
   implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
   implementation 'com.google.firebase:firebase-analytics:18.0.3'
   implementation 'com.facebook.fresco:fresco:2.4.0'
   implementation 'com.facebook.fresco:animated-gif:2.0.0'
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"  // From node_modules
 
   debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
     exclude group:'com.facebook.fbjni'
@@ -207,10 +200,15 @@ dependencies {
     exclude group:'com.facebook.flipper'
   }
 
+  // Hermes
+//  def hermesPath = "../../node_modules/react-native/ReactAndroid/hermes-engine/"
+//  debugImplementation files(hermesPath + "hermes-debug.aar")
+//  releaseImplementation files(hermesPath + "hermesrelease.aar")
+
   if (enableHermes) {
-    def hermesPath = "../../node_modules/hermes-engine/android/"
-    debugImplementation files(hermesPath + "hermes-debug.aar")
-    releaseImplementation files(hermesPath + "hermes-release.aar")
+    implementation("com.facebook.react:hermes-engine:0.70.0") {
+      exclude group: 'com.facebook.react'
+    }
   } else {
     implementation jscFlavor
   }

webrtc-sample/android/app/build.gradle

@@ -5,10 +5,10 @@ buildscript {
         googlePlayServicesVersion = "+"
         firebaseMessagingVersion = "21.1.0"
 
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "32.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        compileSdkVersion = 32
+        targetSdkVersion = 32
         ndkVersion = "21.4.7075529"
     }
     repositories {
@@ -17,28 +17,15 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:4.2.2")
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath 'com.google.gms:google-services:4.3.14'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-         exclusiveContent {
-           filter {
-               includeGroup "com.facebook.react"
-           }
-
-           forRepository {
-
-               maven {
-                   url "$rootDir/../node_modules/react-native/android"
-               }
-
-           }
-
-       }
         mavenLocal()
         maven {
             // Android JSC is installed from npm

webrtc-sample/android/build.gradle

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
- org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+ org.gradle.jvmargs=-XX:+IgnoreUnrecognizedVMOptions -Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -22,3 +22,5 @@ android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.99.0
+
+hermesEnabled=false

webrtc-sample/android/gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

webrtc-sample/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,3 +3,10 @@ rootProject.name = 'WebRTCSample'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 
 include ':app'
+
+includeBuild('../node_modules/@react-native/gradle-plugin')
+
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+    include(":ReactAndroid")
+    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+}

webrtc-sample/android/settings.gradle

@@ -1,4 +1,3 @@
-import 'react-native-gesture-handler'
 import { AppRegistry } from 'react-native';
 import App from './src';
 import { name as appName } from './app.json';