feat: React Native New Architecture Support

.gitignore

@@ -35,6 +35,7 @@ project.xcworkspace
 .gradle
 local.properties
 android.iml
+**/.cxx
 
 # Cocoapods
 #

__mocks__/setup.ts

@@ -9,7 +9,7 @@ jest.mock('@react-native-async-storage/async-storage', () => mockAsyncStorage);
 /*
  * Mock navigator to avoid undefined access in analytics-connector
  */
-global['navigator'] = { product: 'ReactNative' };
+global['navigator'] = { product: 'ReactNative' } as unknown as Navigator;
 
 /*
  * Mock Native Module

android/build.gradle

@@ -6,41 +6,65 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'com.facebook.react'
+
+react {
+    // Intentionally empty
+}
+
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
-    compileSdkVersion safeExtGet('ExperimentReactNativeClient_compileSdkVersion', 31)
-    buildToolsVersion safeExtGet('ExperimentReactNativeClient_buildToolsVersion', '31.0.0')
+    namespace "com.amplitude.experiment.reactnative"
+    compileSdk safeExtGet('ExperimentReactNativeClient_compileSdkVersion', 34)
+    buildToolsVersion safeExtGet('ExperimentReactNativeClient_buildToolsVersion', '34.0.0')
+
     defaultConfig {
-        minSdkVersion safeExtGet('ExperimentReactNativeClient_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('ExperimentReactNativeClient_targetSdkVersion', 31)
+        minSdkVersion safeExtGet('ExperimentReactNativeClient_minSdkVersion', 23)
+        targetSdkVersion safeExtGet('ExperimentReactNativeClient_targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
 
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
 
     buildTypes {
         release {
             minifyEnabled false
         }
     }
-    lintOptions {
+
+    lint {
         disable 'GradleCompatible'
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
+        }
+    }
 }
 
 repositories {
@@ -54,6 +78,6 @@ repositories {
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "com.facebook.react:react-native"
+    implementation "com.facebook.react:react-android"
 }

android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.amplitude.experiment.reactnative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.amplitude.experiment.reactnative">
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>

android/src/main/java/com/amplitude/experiment/reactnative/ExperimentReactNativeClientModule.kt → android/src/main/java/com/amplitude/experiment/reactnative/ExperimentReactNativeClientImpl.kt

@@ -1,26 +1,17 @@
 package com.amplitude.experiment.reactnative
 
 import com.facebook.react.bridge.Promise
-import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableNativeMap
 
-const val MODULE_NAME = "ExperimentReactNativeClient"
-
-@ReactModule(name = MODULE_NAME)
-class ExperimentReactNativeClientModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+class ExperimentReactNativeClientImpl(reactContext: ReactApplicationContext) {
+    companion object {
+        const val NAME = "ExperimentReactNativeClient"
+    }
 
     private val androidContextProvider = AndroidContextProvider(reactContext.applicationContext, false)
 
-    override fun getName(): String {
-        return MODULE_NAME
-    }
-
-    @ReactMethod
-    private fun getApplicationContext(promise: Promise) {
+    public fun getApplicationContext(promise: Promise) {
         promise.resolve(WritableNativeMap().apply {
             putString("version", androidContextProvider.versionName)
             putString("platform", androidContextProvider.osName)
@@ -32,4 +23,4 @@ class ExperimentReactNativeClientModule(private val reactContext: ReactApplicati
             putString("carrier", androidContextProvider.carrier)
         })
     }
-}
+}

android/src/newarch/java/com/amplitude/experiment/reactnative/ExperimentReactNativeClientModule.kt

@@ -0,0 +1,21 @@
+package com.amplitude.experiment.reactnative
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableNativeMap
+
+class ExperimentReactNativeClientModule(reactContext: ReactApplicationContext) :
+    NativeExperimentReactNativeClientSpec(reactContext) {
+
+    private val expRnClient = ExperimentReactNativeClientImpl(reactContext)
+
+    @Override
+    override fun getName(): String {
+        return ExperimentReactNativeClientImpl.NAME
+    }
+
+    @Override
+    override fun getApplicationContext(promise: Promise) {
+        expRnClient.getApplicationContext(promise)
+    }
+}

android/src/oldarch/java/com/amplitude/experiment/reactnative/ExperimentReactNativeClientModule.kt

@@ -0,0 +1,24 @@
+package com.amplitude.experiment.reactnative
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.WritableNativeMap
+
+class ExperimentReactNativeClientModule(private val reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    private val expRnClient = ExperimentReactNativeClientImpl(reactContext)
+
+    @Override
+    override fun getName(): String {
+        return ExperimentReactNativeClientImpl.NAME
+    }
+
+    @ReactMethod
+    fun getApplicationContext(promise: Promise) {
+        expRnClient.getApplicationContext(promise)
+    }
+}