feat(rn): add new architecture support

README.md

@@ -2,6 +2,8 @@
 
 rn bs diff patch file
 
+Supports both the legacy bridge and React Native New Architecture (TurboModule).
+
 ## Installation
 
 ```sh

android/build.gradle

@@ -20,6 +20,12 @@ apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
+
+  react {
+    jsRootDir = file("../src")
+    libraryName = "RNBsDiffPatchSpec"
+    codegenJavaPackageName = "com.jimmydaddy.bsdiffpatch"
+  }
 }
 
 def getExtOrDefault(name) {
@@ -42,11 +48,18 @@ def supportsNamespace() {
 android {
   if (supportsNamespace()) {
     namespace "com.jimmydaddy.bsdiffpatch"
+  }
 
-    sourceSets {
-      main {
+  sourceSets {
+    main {
+      if (supportsNamespace()) {
         manifest.srcFile "src/main/AndroidManifestNew.xml"
       }
+      java.setSrcDirs(
+        isNewArchitectureEnabled()
+          ? ["src/main/java", "newarch/java"]
+          : ["src/main/java", "oldarch/java"]
+      )
     }
   }
 
@@ -100,4 +113,3 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
-

android/cpp-adapter.cpp

@@ -1,12 +1,7 @@
 #include <jni.h>
 #include "react-native-bs-diff-patch.h"
 
-extern "C"
-
-JNIEXPORT jint JNICALL
-Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsDiffFile(JNIEnv *env,
-                                                                            jobject type, jstring oldFile_,
-                                                  jstring newFile_, jstring patchFile_) {
+static jint bsDiffFileJNI(JNIEnv *env, jstring oldFile_, jstring newFile_, jstring patchFile_) {
     const char *oldFile = env->GetStringUTFChars(oldFile_, 0);
     const char *newFile = env->GetStringUTFChars(newFile_, 0);
     const char *patchFile = env->GetStringUTFChars(patchFile_, 0);
@@ -20,10 +15,7 @@ Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsDiffFile(JNIE
     return result;
 }
 
-extern "C" JNIEXPORT jint JNICALL
-Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsPatchFile(JNIEnv *env,
-                                                                             jobject type, jstring oldFile_,
-                                                   jstring newFile_, jstring patchFile_) {
+static jint bsPatchFileJNI(JNIEnv *env, jstring oldFile_, jstring newFile_, jstring patchFile_) {
     const char *oldFile = env->GetStringUTFChars(oldFile_, 0);
     const char *newFile = env->GetStringUTFChars(newFile_, 0);
     const char *patchFile = env->GetStringUTFChars(patchFile_, 0);
@@ -36,3 +28,21 @@ Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsPatchFile(JNI
 
     return result;
 }
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchNative_bsDiffFile(JNIEnv *env,
+                                                             jobject type,
+                                                             jstring oldFile_,
+                                                             jstring newFile_,
+                                                             jstring patchFile_) {
+    return bsDiffFileJNI(env, oldFile_, newFile_, patchFile_);
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchNative_bsPatchFile(JNIEnv *env,
+                                                              jobject type,
+                                                              jstring oldFile_,
+                                                              jstring newFile_,
+                                                              jstring patchFile_) {
+    return bsPatchFileJNI(env, oldFile_, newFile_, patchFile_);
+}

android/newarch/java/com/jimmydaddy/bsdiffpatch/BsDiffPatchModule.kt

@@ -0,0 +1,43 @@
+package com.jimmydaddy.bsdiffpatch
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = BsDiffPatchNative.NAME)
+class BsDiffPatchModule(reactContext: ReactApplicationContext) :
+  NativeBsDiffPatchSpec(reactContext) {
+  override fun getName(): String = BsDiffPatchNative.NAME
+
+  override fun patch(
+    oldFile: String,
+    newFile: String,
+    patchFile: String,
+    promise: Promise
+  ) {
+    execute(promise) {
+      BsDiffPatchNative.patch(oldFile, newFile, patchFile)
+    }
+  }
+
+  override fun diff(
+    oldFile: String,
+    newFile: String,
+    patchFile: String,
+    promise: Promise
+  ) {
+    execute(promise) {
+      BsDiffPatchNative.diff(oldFile, newFile, patchFile)
+    }
+  }
+
+  private fun execute(promise: Promise, block: () -> Int) {
+    try {
+      promise.resolve(block())
+    } catch (error: BsDiffPatchException) {
+      promise.reject(error.code, error.message, error)
+    } catch (error: Exception) {
+      promise.reject("EUNSPECIFIED", error.message, error)
+    }
+  }
+}

android/newarch/java/com/jimmydaddy/bsdiffpatch/BsDiffPatchPackage.kt

@@ -0,0 +1,36 @@
+package com.jimmydaddy.bsdiffpatch
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class BsDiffPatchPackage : TurboReactPackage() {
+  override fun getModule(
+    name: String,
+    reactContext: ReactApplicationContext
+  ): NativeModule? {
+    return if (name == BsDiffPatchNative.NAME) {
+      BsDiffPatchModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      mapOf(
+        BsDiffPatchNative.NAME to ReactModuleInfo(
+          BsDiffPatchNative.NAME,
+          BsDiffPatchModule::class.java.name,
+          false,
+          false,
+          false,
+          false,
+          true
+        )
+      )
+    }
+  }
+}

android/oldarch/java/com/jimmydaddy/bsdiffpatch/BsDiffPatchModule.kt

@@ -0,0 +1,52 @@
+package com.jimmydaddy.bsdiffpatch
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = BsDiffPatchNative.NAME)
+class BsDiffPatchModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+  override fun getName(): String = BsDiffPatchNative.NAME
+
+  @ReactMethod
+  fun patch(oldFile: String?, newFile: String?, patchFile: String?, promise: Promise) {
+    execute(promise) {
+      BsDiffPatchNative.patch(
+        requireArgument(oldFile, "oldFile"),
+        requireArgument(newFile, "newFile"),
+        requireArgument(patchFile, "patchFile")
+      )
+    }
+  }
+
+  @ReactMethod
+  fun diff(oldFile: String?, newFile: String?, patchFile: String?, promise: Promise) {
+    execute(promise) {
+      BsDiffPatchNative.diff(
+        requireArgument(oldFile, "oldFile"),
+        requireArgument(newFile, "newFile"),
+        requireArgument(patchFile, "patchFile")
+      )
+    }
+  }
+
+  private fun requireArgument(value: String?, fieldName: String): String {
+    if (value.isNullOrEmpty()) {
+      throw BsDiffPatchException("EINVAL", "$fieldName can not be null or empty")
+    }
+    return value
+  }
+
+  private fun execute(promise: Promise, block: () -> Int) {
+    try {
+      promise.resolve(block())
+    } catch (error: BsDiffPatchException) {
+      promise.reject(error.code, error.message, error)
+    } catch (error: Exception) {
+      promise.reject("EUNSPECIFIED", error.message, error)
+    }
+  }
+}

android/oldarch/java/com/jimmydaddy/bsdiffpatch/BsDiffPatchPackage.kt

@@ -0,0 +1,16 @@
+package com.jimmydaddy.bsdiffpatch
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+class BsDiffPatchPackage : ReactPackage {
+  override fun createNativeModules(
+    reactContext: ReactApplicationContext
+  ): List<NativeModule> = listOf(BsDiffPatchModule(reactContext))
+
+  override fun createViewManagers(
+    reactContext: ReactApplicationContext
+  ): List<ViewManager<*, *>> = emptyList()
+}