save wip

Author: transphorm

.watchmanconfig

@@ -1,3 +1,26 @@
 {
-
+  "ignore_dirs": [
+    "node_modules",
+    "dist",
+    "build",
+    "vendor",
+    "Pods",
+    "ios/build",
+    "android/build",
+    "app/android/build",
+    "app/ios/build",
+    "app/ios/Pods",
+    "contracts/artifacts",
+    "contracts/cache",
+    "circuits/build",
+    "common/node_modules",
+    "contracts/node_modules",
+    "circuits/node_modules",
+    "sdk/node_modules",
+    "packages/mobile-sdk-alpha/node_modules",
+    "packages/mobile-sdk-alpha/demo-app/node_modules",
+    "packages/mobile-sdk-alpha/demo-app/android/build",
+    "packages/mobile-sdk-alpha/demo-app/ios/build",
+    "registry/node_modules"
+  ]
 }

packages/mobile-sdk-alpha/demo-app/android/app/build.gradle

@@ -42,15 +42,17 @@ android {
     buildFeatures {
         buildConfig true
     }
+
+    packagingOptions {
+        pickFirst '**/libhermes.so'
+        pickFirst '**/libhermes_executor.so'
+    }
 }
 
 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
-    } else {
-        implementation 'org.webkit:android-jsc:+'
+    implementation("com.facebook.react:react-android:0.76.9")
+    implementation("com.facebook.react:hermes-android:0.76.9")
+    if (project.hasProperty('newArchEnabled') ? newArchEnabled.toBoolean() : false) {
+        implementation("com.facebook.react:react-android-codegen:0.76.9")
     }
 }

packages/mobile-sdk-alpha/demo-app/android/app/src/main/java/com/selfxyz/demoapp/MainApplication.kt

@@ -1,9 +1,46 @@
 package com.selfxyz.demoapp
 
 import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.soloader.SoLoader
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
+
+class MainApplication : Application(), ReactApplication {
+
+    private val mReactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) {
+        override fun getPackages(): List<ReactPackage> {
+            // Packages that cannot be autolinked yet can be added manually here, for example:
+            // packages.add(new MyReactNativePackage());
+            return PackageList(this).packages
+        }
+
+        override fun getJSMainModuleName(): String {
+            return "index"
+        }
+
+        override fun getUseDeveloperSupport(): Boolean {
+            return BuildConfig.DEBUG
+        }
+
+        override val isNewArchEnabled: Boolean
+            get() = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean
+            get() = BuildConfig.IS_HERMES_ENABLED
+    }
+
+    override val reactNativeHost: ReactNativeHost
+        get() = mReactNativeHost
 
-class MainApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        SoLoader.init(this, OpenSourceMergedSoMapping)
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            load()
+        }
     }
 }

packages/mobile-sdk-alpha/demo-app/android/gradle.properties

@@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

packages/mobile-sdk-alpha/package.json

@@ -16,9 +16,7 @@
       "types": "./dist/esm/index.d.ts",
       "browser": "./dist/esm/browser.js",
       "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.cjs",
-      "react-native": "./dist/esm/index.js",
-      "default": "./dist/esm/index.js"
+      "require": "./dist/cjs/index.cjs"
     },
     "./browser": {
       "types": "./dist/esm/browser.d.ts",