Merge pull request zingolabs#770 from dorianvp/bump_rn_0.74.0

Bump react-native to 0.74.0

Author: juanky201271

.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+**/.xcode.env.local
 
 # Exclude compiled libs
 android/app/src/main/jniLibs
@@ -76,7 +77,7 @@ buck-out/
 *.jsbundle
 
 # CocoaPods
-/ios/Pods/
+**/Pods/
 /ios/Podfile.lock
 
 # e2e test logs

Gemfile

@@ -6,5 +6,4 @@ ruby ">= 2.6.10"
 # Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
 # bound in the template on Cocoapods with next React Native release.
 gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
-gem 'xcodeproj', '< 1.26.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

__mocks__/react-native-vision-camera.js

@@ -0,0 +1,21 @@
+// Simple mock for Camera
+export const Camera = () => null;
+
+// Mock that returns a mocked camera object
+export const useCameraDevice = jest.fn(() => ({
+  id: 'mocked-camera',
+  name: 'Mock Camera',
+  position: 'back',
+}));
+
+// Mock that returns permission status and a request function
+export const useCameraPermission = jest.fn(() => ({
+  hasPermission: true,
+  requestPermission: jest.fn(),
+}));
+
+// Mock that provides a mocked scanner function
+export const useCodeScanner = jest.fn(() => ({
+  codeTypes: ['qr', 'ean-13'],
+  onCodeScanned: jest.fn(),
+}));

__tests__/__snapshots__/Scanner.snapshot.tsx.snap

@@ -8,7 +8,5 @@ exports[`Component Scanner - test Scanner - snapshot 1`] = `
       "width": "100%",
     }
   }
->
-  <mockQRCodeScanner />
-</RCTSafeAreaView>
+/>
 `;

android/app/build.gradle

@@ -109,7 +109,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 218 // Real
         versionName "zingo-1.11.0" // Real
-        missingDimensionStrategy 'react-native-camera', 'general'
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -225,7 +224,6 @@ android.applicationVariants.configureEach { variant ->
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
-    implementation("com.facebook.react:flipper-integration")
 
     androidTestImplementation('com.wix:detox:20.27.2')
     implementation 'androidx.appcompat:appcompat:1.7.0'
@@ -258,7 +256,8 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_version"
 
     // optional - GCMNetworkManager support
-    implementation "androidx.work:work-gcm:$work_version"
+    // GCM is deprecated
+    //implementation "androidx.work:work-gcm:$work_version"
 
     // optional - Test helpers
     androidTestImplementation "androidx.work:work-testing:$work_version"

android/app/src/debug/AndroidManifest.xml

@@ -2,6 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.CAMERA"
+        tools:ignore="PermissionImpliesUnsupportedChromeOsHardware" />
 
     <application 
         android:usesCleartextTraffic="false"

android/app/src/main/java/org/ZingoLabs/Zingo/MainApplication.kt

@@ -1,6 +1,7 @@
 package org.ZingoLabs.Zingo
 
 import android.app.Application
+import android.content.Context
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
@@ -10,39 +11,39 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
-import android.content.Context
 import java.lang.ref.WeakReference
 
 class MainApplication : Application(), ReactApplication {
 
     override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-              add(RPCPackage())
+            object : DefaultReactNativeHost(this) {
+                override fun getPackages(): List<ReactPackage> =
+                        PackageList(this).packages.apply {
+                            // Packages that cannot be autolinked yet can be added manually here,
+                            // for example:
+                            // add(MyReactNativePackage())
+                            add(RPCPackage())
+                        }
+
+                override fun getJSMainModuleName(): String = "index"
+
+                override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+                override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+                override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
             }
- 
-        override fun getJSMainModuleName(): String = "index"
- 
-        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
- 
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
- 
+
     override val reactHost: ReactHost
-        get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
- 
+        get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
     override fun onCreate() {
         super.onCreate()
         context = WeakReference(applicationContext)
 
-
         SoLoader.init(this, false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
+            // If you opted-in for the New Architecture, we load the native entry point for this
+            // app.
             load()
         }
     }
@@ -58,4 +59,3 @@ class MainApplication : Application(), ReactApplication {
         }
     }
 }
-

android/build.gradle

@@ -6,8 +6,8 @@ buildscript {
         minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
-        ndkVersion = "24.0.8215888"
-        kotlinVersion = '1.8.22'
+        ndkVersion = "26.1.10909125"
+        kotlinVersion = "1.9.22"
     }
     repositories {
         google()
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
       classpath('com.android.tools.build:gradle:8.3.2')
       classpath("com.facebook.react:react-native-gradle-plugin")
-      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin"
+      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -31,18 +31,4 @@ allprojects {
      maven { url 'https://www.jitpack.io' }
    }
  }
-
-// this is not the best solution, but while the libraries have no namespace...
-// https://discuss.gradle.org/t/namespace-not-specified-for-agp-8-0-0/45850/5
-
-//subprojects {
-//   afterEvaluate { project ->
-//       if (project.hasProperty('android')) {
-//           project.android {
-//               if (namespace == null) {
-//                   namespace project.group
-//               }
-//           }
-//       }
-//   }
-//}
+ 

android/gradle.properties

@@ -44,3 +44,5 @@ hermesEnabled=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+
+VisionCamera_enableCodeScanner=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Fri Jan 24 19:05:10 MST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists