Merge pull request #246 from internxt/revert-220-bring_updates

Revert "[_] Bring updates"

Author: TamaraFinogina

.github/workflows/ci-lua.yml

@@ -7,7 +7,7 @@ jobs:
     name: Luacheck
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
 
     - name: Install luarocks
       run: sudo apt-get --install-recommends -y install luarocks

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f #v10.2.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
         with:
           stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
           stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'

.gitignore

@@ -13,9 +13,6 @@ all.css
 # Coverage
 coverage
 
-#Build artifacts
-dist/
-
 # CocoaPods
 Pods/
 

.nvmrc

@@ -1 +1 @@
-24
+22

Gemfile.lock

@@ -26,17 +26,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1220.0)
-    aws-sdk-core (3.242.0)
+    aws-partitions (1.1196.0)
+    aws-sdk-core (3.240.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.122.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.208.0)
       aws-sdk-core (~> 3, >= 3.234.0)

Makefile

@@ -3,11 +3,11 @@ CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
 DIST_DIR = dist
 ONNX_DIR= node_modules/onnxruntime-web
-LIBJITSIMEET_DIR = node_modules/lib-meet
+LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet
 TF_WASM_DIR = node_modules/@tensorflow/tfjs-backend-wasm/dist/
 RNNOISE_WASM_DIR = node_modules/@jitsi/rnnoise-wasm/dist
-EXCALIDRAW_DIR = node_modules/@jitsi/excalidraw/dist/prod
-EXCALIDRAW_DIR_DEV = node_modules/@jitsi/excalidraw/dist/dev
+EXCALIDRAW_DIR = node_modules/@jitsi/excalidraw/dist/excalidraw-assets
+EXCALIDRAW_DIR_DEV = node_modules/@jitsi/excalidraw/dist/excalidraw-assets-dev
 TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
 MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models
 FACE_MODELS_DIR = node_modules/@vladmandic/human-models/models
@@ -28,16 +28,14 @@ endif
 all: compile deploy
 
 compile: clean
-	NODE_OPTIONS=--max-old-space-size=8192 $(WEBPACK) --env bundle=app & \
-    NODE_OPTIONS=--max-old-space-size=8192 $(WEBPACK) --env bundle=api & \
-    NODE_OPTIONS=--max-old-space-size=8192 $(WEBPACK) --env bundle=workers & \
-    wait
+	NODE_OPTIONS=--max-old-space-size=8192 \
+	$(WEBPACK)
 
 clean:
 	rm -fr $(BUILD_DIR)
 
 .NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-excalidraw deploy-tflite deploy-meet-models deploy-lib-meet deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-excalidraw deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -52,9 +50,9 @@ deploy-appbundle:
 	cp $(BUILD_DIR)/*.min.js $(DEPLOY_DIR)
 	-cp $(BUILD_DIR)/*.min.js.map $(DEPLOY_DIR)
 
-deploy-lib-meet:
+deploy-lib-jitsi-meet:
 	cp \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-meet.* \
+		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.* \
 		$(LIBJITSIMEET_DIR)/dist/umd/vodozemac.wasm \
 		$(DEPLOY_DIR)
 
@@ -74,12 +72,14 @@ deploy-tflite:
 		$(DEPLOY_DIR)
 
 deploy-excalidraw:
-	mkdir -p $(DEPLOY_DIR)/excalidraw
-	cp -R $(EXCALIDRAW_DIR)/fonts $(DEPLOY_DIR)/excalidraw/
+	cp -R \
+		$(EXCALIDRAW_DIR) \
+		$(DEPLOY_DIR)/
 
 deploy-excalidraw-dev:
-	mkdir -p $(DEPLOY_DIR)/excalidraw
-	cp -R $(EXCALIDRAW_DIR_DEV)/fonts $(DEPLOY_DIR)/excalidraw/
+	cp -R \
+		$(EXCALIDRAW_DIR_DEV) \
+		$(DEPLOY_DIR)/
 
 deploy-meet-models:
 	cp \
@@ -103,7 +103,7 @@ deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
 .NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-meet deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks
 	$(WEBPACK_DEV_SERVER)
 
 source-package:

android/app/proguard-rules-release.pro

@@ -5,5 +5,6 @@
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
 
-# Giphy SDK using Kotlin Parcelize
+# R8 missing classes - suppress warnings
+-dontwarn com.facebook.memory.config.MemorySpikeConfig
 -dontwarn kotlinx.parcelize.Parcelize

android/build.gradle

@@ -32,7 +32,7 @@ buildscript {
         googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
 
         //React Native and Hermes Version
-        rnVersion = "0.79.7"
+        rnVersion = "0.77.2"
 
         // Java dependencies
         javaVersion = JavaVersion.VERSION_17
@@ -46,7 +46,6 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
         classpath "com.android.tools.build:gradle:$rootProject.ext.gradlePluginVersion"
-        classpath "com.facebook.react:react-native-gradle-plugin:$rootProject.ext.rnVersion"
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
@@ -72,11 +71,6 @@ allprojects {
                         details.useVersion rootProject.ext.rnVersion
                     }
                 }
-                // Redirect the old com.facebook.hermes group (used by some third-party modules)
-                // to the canonical com.facebook.react:hermes-android artifact.
-                if (details.requested.group == 'com.facebook.hermes' && details.requested.name == 'hermes-android') {
-                    details.useTarget "com.facebook.react:hermes-android:$rnVersion"
-                }
             }
         }
     }
@@ -85,7 +79,7 @@ allprojects {
     // on and which are not available in third-party Maven repositories need to
     // be deployed in a Maven repository of ours.
 
-    if (project.name.contains('react-native')) {
+    if (project.name.startsWith('react-native-')) {
         apply plugin: 'maven-publish'
         publishing {
             publications {}
@@ -116,7 +110,7 @@ allprojects {
             }
         }
 
-        if (project.name.contains('react-native')) {
+        if (project.name.startsWith('react-native-')) {
             def npmManifest = project.file('../package.json')
             def json = new JsonSlurper().parseText(npmManifest.text)
 

android/gradle.properties

@@ -12,9 +12,6 @@
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
 
 org.gradle.jvmargs=-Xmx4048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-# -Xmx4048m: Set max heap size to 4GB to prevent out-of-memory errors during builds.
-# -XX:+HeapDumpOnOutOfMemoryError: Save heap dump file when memory errors occur (for debugging).
-# -Dfile.encoding=UTF-8: Use UTF-8 encoding for file operations (handles international characters).
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

android/sdk/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.facebook.react'
 apply plugin: 'maven-publish'
 
 android {
@@ -53,19 +52,19 @@ dependencies {
 
     // Only add these packages if we are NOT doing a LIBRE_BUILD
     if (!rootProject.ext.libreBuild) {
-        implementation project(':amplitude-analytics-react-native')
-        implementation project(':giphy-react-native-sdk')
-        implementation(project(':react-native-google-signin-google-signin')) {
+        implementation project(':react-native-amplitude')
+        implementation project(':react-native-giphy')
+        implementation(project(':react-native-google-signin')) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
         }
     }
 
-    implementation project(':react-native-async-storage-async-storage')
+    implementation project(':react-native-async-storage')
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
-    implementation project(':react-native-clipboard-clipboard')
-    implementation project(':react-native-community-netinfo')
+    implementation project(':react-native-community_clipboard')
+    implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
     implementation(project(':react-native-device-info')) {
         exclude group: 'com.google.firebase'
@@ -74,13 +73,13 @@ dependencies {
     }
     implementation project(':react-native-gesture-handler')
     implementation project(':react-native-get-random-values')
-    implementation project(':sayem314-react-native-keep-awake')
+    implementation project(':react-native-keep-awake')
     implementation project(':react-native-orientation-locker')
     implementation project(':react-native-pager-view')
     implementation project(':react-native-performance')
     implementation project(':react-native-safe-area-context')
     implementation project(':react-native-screens')
-    implementation project(':react-native-community-slider')
+    implementation project(':react-native-slider')
     implementation project(':react-native-sound')
     implementation project(':react-native-splash-view')
     implementation project(':react-native-svg')
@@ -136,8 +135,17 @@ android.libraryVariants.all { def variant ->
         // Set up dev mode
         def devEnabled = !targetName.toLowerCase().contains("release")
 
+        // Run the bundler
+        // Use full path to node to avoid PATH issues in Gradle
+        def nodePath = System.getenv('NVM_BIN') ? "${System.getenv('NVM_BIN')}/node" : "node"
+
+        // Debug: Print the node path and environment
+        println "Using node path: ${nodePath}"
+        println "NVM_BIN: ${System.getenv('NVM_BIN')}"
+        println "Working directory: ${reactRoot}"
+
         commandLine(
-                "node",
+                nodePath,
                 "node_modules/react-native/scripts/bundle.js",
                 "--platform", "android",
                 "--dev", "${devEnabled}",
@@ -150,22 +158,70 @@ android.libraryVariants.all { def variant ->
         enabled !devEnabled
     }
 
-    // Ensure proper task ordering for Gradle 8.14+ strict dependency validation
-    currentBundleTask.configure {
-        mustRunAfter {
-            def config = project.configurations.findByName("${targetPath}CompileClasspath")
-            
-            // Fallback to an empty list(mustRunAfter expects a list, not "null" which is the og fallback), 
-            // means no config, means no constraints
-            (config?.allDependencies ?: [])
-                .findAll { it.hasProperty('dependencyProject') }
-                .collectMany { dependency ->
-                    project.project(dependency.dependencyProject.path)
-                        .tasks.matching { it.name.contains(targetName) }
+    // GRADLE REQUIREMENTS (Gradle 8.7+ / AGP 8.5.0+):
+    
+    // This task requires explicit dependencies on resource tasks from all React Native modules
+    // due to Gradle's strict validation of task dependencies.
+
+    // Without these dependencies,
+    // builds will fail with errors like:
+    // "Task ':sdk:bundleReleaseJsAndAssets' uses the output of task ':react-native-amplitude:packageReleaseResources'
+    // without declaring a dependency on it."
+
+    // The automatic dependency resolution below ensures all required resource tasks are properly
+    // declared as dependencies before this task executes.
+
+    if (variant.name.toLowerCase().contains("release")) {
+        rootProject.subprojects.each { subproject ->
+            if (
+                subproject.name.startsWith("react-native-") ||
+                subproject.name.startsWith("@react-native-") ||
+                subproject.name.startsWith("@giphy/")
+            ) {
+                [
+                    "packageReleaseResources",
+                    "generateReleaseResValues",
+                    "generateReleaseResources",
+                    "generateReleaseBuildConfig",
+                    "processReleaseManifest",
+                    "writeReleaseAarMetadata",
+                    "generateReleaseRFile",
+                    "compileReleaseLibraryResources",
+                    "compileReleaseJavaWithJavac",
+                    "javaPreCompileRelease",
+                    "bundleLibCompileToJarRelease",
+                    "exportReleaseConsumerProguardFiles",
+                    "mergeReleaseGeneratedProguardFiles",
+                    "mergeReleaseJniLibFolders",
+                    "mergeReleaseShaders",
+                    "packageReleaseAssets",
+                    "processReleaseJavaRes",
+                    "prepareReleaseArtProfile",
+                    "copyReleaseJniLibsProjectOnly",
+                    "extractDeepLinksRelease",
+                    "createFullJarRelease",
+                    "generateReleaseLintModel",
+                    "writeReleaseLintModelMetadata",
+                    "generateReleaseLintVitalModel",
+                    "lintVitalAnalyzeRelease",
+                    "lintReportRelease",
+                    "lintAnalyzeRelease",
+                    "lintReportDebug",
+                    "lintAnalyzeDebug"
+                ].each { taskName ->
+                    if (subproject.tasks.findByName(taskName)) {
+                        currentBundleTask.dependsOn(subproject.tasks.named(taskName))
+                    }
                 }
+
+                // Also depend on the main build task to ensure all sub-tasks are completed
+                if (subproject.tasks.findByName("build")) {
+                    currentBundleTask.dependsOn(subproject.tasks.named("build"))
+                }
+            }
         }
     }
-    
+
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
     variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
@@ -235,7 +291,7 @@ publishing {
                     def groupId = it.moduleGroup
                     def artifactId = it.moduleName
 
-                    if (artifactId.contains('react-native')) {
+                    if (artifactId.startsWith('react-native-')) {
                         groupId = rootProject.ext.moduleGroupId
                     }