Merge pull request #25 from MirrorFly/release_sdk/V2.3.4

Release sdk/v2.3.4

Author: Vanithacontus

.gitignore

@@ -33,13 +33,13 @@ local.properties
 .cxx/
 *.keystore
 !debug.keystore
+.kotlin/
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
-package-lock.json
 yarn.lock
 
 # fastlane

App.js

@@ -2,17 +2,18 @@ import React from 'react';
 import { Platform } from 'react-native';
 import { MirrorflyChatComponent } from './src/MirrorflyChatComponent';
 import { CallComponent } from './src/calls/CallComponent';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 export const MirrorflyComponent = (props = {}) => {
    const renderCallComponent = () => {
       return Platform.OS === 'ios' ? <CallComponent /> : null;
    };
 
    return (
-      <>
+      <SafeAreaProvider>
          <MirrorflyChatComponent {...props} />
          {renderCallComponent()}
-      </>
+      </SafeAreaProvider>
    );
 };
 

Gemfile

@@ -6,3 +6,11 @@ ruby ">= 2.6.10"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+ 
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'

__tests__/App.test.tsx

@@ -2,16 +2,12 @@
  * @format
  */
 
-import 'react-native';
 import React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
 import App from '../App';
 
-// Note: import explicitly to use the types shipped with jest.
-import {it} from '@jest/globals';
-
-// Note: test renderer must be required after react-native.
-import renderer from 'react-test-renderer';
-
-it('renders correctly', () => {
-  renderer.create(<App />);
+test('renders correctly', async () => {
+  await ReactTestRenderer.act(() => {
+    ReactTestRenderer.create(<App />);
+  });
 });

android/app/build.gradle

@@ -69,14 +69,14 @@ def enableProguardInReleaseBuilds = false
  * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
 
@@ -97,7 +97,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "3.3.7"
+        versionName "3.4.5"
         /** Add this for react-native-camera */
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true

android/app/jni/CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_C_FLAGS "-w -std=c11 -DANDROID -D_LARGEFILE_SOURCE=1 -g")
 set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libswscale.a,
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384,--exclude-libs,${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libswscale.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavformat.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavcodec.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavresample.a,

android/app/src/main/java/com/mirrorfly_rn/MainApplication.kt

@@ -11,6 +11,7 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.modules.i18nmanager.I18nUtil
 import com.facebook.soloader.SoLoader
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.mirrorfly_rn.newfilecompression.systemlibLoader.NativeLoader
 
 class MainApplication : Application(), ReactApplication {
@@ -48,7 +49,7 @@ class MainApplication : Application(), ReactApplication {
         NativeLoader.initNativeLibs(applicationContext)
         val sharedI18nUtilInstance = I18nUtil.instance
         sharedI18nUtilInstance.allowRTL(applicationContext, true)
-        SoLoader.init(this, false)
+        SoLoader.init(this, OpenSourceMergedSoMapping)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
             load()

android/app/src/main/java/com/mirrorfly_rn/MediaService.kt

@@ -738,7 +738,7 @@ class MediaService(var reactContext: ReactApplicationContext?) :
                     Log.d(name, "uploadUrl $bytesRead $uploadUrl")
                     // Upload the chunk
                     val (success, statusCode) = uploadChunk(
-                        uploadUrl,
+                        uploadUrl.toString(),
                         buffer.copyOf(bytesRead)
                     ) // Use only the read portion of the buffer
 
@@ -1058,7 +1058,7 @@ class MediaService(var reactContext: ReactApplicationContext?) :
                     }
 
                 }
-            val mediacontrol = MediaController(formatedPath, outputPath, compressListener)
+            val mediacontrol = MediaController(formatedPath!!, outputPath, compressListener)
             mediacontrol.processVideo()
         } catch (e: java.lang.Exception) {
             promise.reject("COMPRESSION_FAILED", "Compression failed: " + e.message, e)

android/build.gradle

@@ -1,18 +1,18 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
          /** Add this Firebase intialize */