refactor: improve backward compatible turbo module template

Author: satya164

.github/workflows/build-templates.yml

@@ -2,6 +2,7 @@ name: Build template
 on:
   push:
     paths:
+      - '.github/workflows/build-templates.yml'
       - 'packages/create-react-native-library/**'
       - '!**.md'
 

packages/create-react-native-library/templates/cpp-library/android/cpp-adapter.cpp

@@ -3,10 +3,6 @@
 
 extern "C"
 JNIEXPORT jint JNICALL
-<% if (project.architecture == 'mixed') { -%>
-Java_com_<%- project.package_cpp -%>_<%- project.name -%>ModuleImpl_multiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-<% } else { -%>
 Java_com_<%- project.package_cpp -%>_<%- project.name -%>Module_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-<% } -%>
     return <%- project.package_cpp -%>::multiply(a, b);
 }

packages/create-react-native-library/templates/java-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

@@ -26,6 +26,8 @@ public String getName() {
   static {
     System.loadLibrary("cpp");
   }
+
+  private static native double nativeMultiply(double a, double b);
 <% } -%>
 
   // Example method
@@ -38,8 +40,4 @@ public void multiply(double a, double b, Promise promise) {
     promise.resolve(a * b);
 <% } -%>
   }
-
-<% if (project.cpp) { -%>
-  private static native double nativeMultiply(double a, double b);
-<% } -%>
 }

packages/create-react-native-library/templates/java-library-mixed/android/src/legacy/{%- project.name %}Spec.java

@@ -0,0 +1,13 @@
+package com.<%- project.package -%>;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.Promise;
+
+abstract class <%- project.name -%>Spec extends ReactContextBaseJavaModule {
+  <%- project.name -%>Spec(ReactApplicationContext context) {
+    super(context);
+  }
+
+  public abstract void multiply(double a, double b, Promise promise);
+}

packages/create-react-native-library/templates/java-library-mixed/android/src/legacy/{%- project.name %}Module.java renamed to packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

@@ -3,11 +3,10 @@
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-public class <%- project.name -%>Module extends ReactContextBaseJavaModule {
-  public static final String NAME = <%- project.name -%>ModuleImpl.NAME;
+public class <%- project.name -%>Module extends <%- project.name -%>Spec {
+  public static final String NAME = "<%- project.name -%>";
 
   <%- project.name -%>Module(ReactApplicationContext context) {
     super(context);
@@ -19,10 +18,22 @@ public String getName() {
     return NAME;
   }
 
+<% if (project.cpp) { -%>
+  static {
+    System.loadLibrary("cpp");
+  }
+
+  public static native double nativeMultiply(double a, double b);
+<% } -%>
+
   // Example method
   // See https://reactnative.dev/docs/native-modules-android
   @ReactMethod
   public void multiply(double a, double b, Promise promise) {
-    promise.resolve(<%- project.name -%>ModuleImpl.multiply(a, b));
+<% if (project.cpp) { -%>
+    promise.resolve(nativeMultiply(a, b));
+<% } else { -%>
+    promise.resolve(a * b);
+<% } -%>
   }
 }

packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ModuleImpl.java

@@ -0,0 +1,9 @@
+package com.<%- project.package -%>;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+abstract class <%- project.name -%>Spec extends Native<%- project.name -%>Spec {
+  <%- project.name -%>Spec(ReactApplicationContext context) {
+    super(context);
+  }
+}

packages/create-react-native-library/templates/java-library-mixed/android/src/turbo/{%- project.name %}Module.java

@@ -23,6 +23,8 @@ public String getName() {
   static {
     System.loadLibrary("cpp");
   }
+
+  private static native double nativeMultiply(double a, double b);
 <% } -%>
 
   // Example method
@@ -35,8 +37,4 @@ public double multiply(double a, double b) {
     return a * b;
 <% } -%>
   }
-
-<% if (project.cpp) { -%>
-  private static native double nativeMultiply(double a, double b);
-<% } -%>
 }

packages/create-react-native-library/templates/java-library-mixed/android/src/turbo/{%- project.name %}Spec.java

@@ -5,10 +5,11 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
 
-class <%- project.name -%>Module(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+class <%- project.name -%>Module(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
 
   override fun getName(): String {
-    return "<%- project.name -%>"
+    return NAME
   }
 
   // Example method
@@ -17,4 +18,8 @@ class <%- project.name -%>Module(reactContext: ReactApplicationContext) : ReactC
   fun multiply(a: Double, b: Double, promise: Promise) {
     promise.resolve(a * b)
   }
+
+  companion object {
+    const val NAME = "<%- project.name -%>"
+  }
 }