Merge pull request #86 from patrickkabwe/feat/nitro-v0.22

patrickkabwe · web-flow · commit b6ee929b39d2 · 2025-02-06T09:46:56.000+02:00
feat: upgrade nitro v0.22.0
diff --git a/.changeset/beige-roses-change.md b/.changeset/beige-roses-change.md
@@ -0,0 +1,5 @@
+---
+'create-nitro-module': minor
+---
+
+feat: upgrade to nitro v0.22.0
diff --git a/assets/template/android/src/main/java/com/$$androidNamespace$$/$$androidCxxLibName$$Package.java b/assets/template/android/src/main/java/com/$$androidNamespace$$/$$androidCxxLibName$$Package.java
@@ -10,6 +10,8 @@
 import com.facebook.react.TurboReactPackage;
 import com.margelo.nitro.core.HybridObject;
 import com.margelo.nitro.core.HybridObjectRegistry;
+import com.margelo.nitro.$$androidNamespace$$.$$androidCxxLibName$$OnLoad;
+
 
 import java.util.HashMap;
 import java.util.function.Supplier;
@@ -29,6 +31,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
   }
 
   static {
-    System.loadLibrary("$$androidCxxLibName$$");
+    $$androidCxxLibName$$OnLoad.initializeNative();
   }
 }
diff --git a/assets/template/package.json b/assets/template/package.json
@@ -50,8 +50,8 @@
     "devDependencies": {
         "react": "^18.3.1",
         "react-native": "^0.77.0",
-        "nitro-codegen": "^0.21.0",
-        "react-native-nitro-modules": "^0.21.0",
+        "nitro-codegen": "^0.22.0",
+        "react-native-nitro-modules": "^0.22.0",
         "react-native-builder-bob": "^0.35.2",
         "release-it": "^18.1.2",
         "@release-it/bumper": "^7.0.1",
diff --git a/src/code-snippets/code.android.ts b/src/code-snippets/code.android.ts
@@ -14,10 +14,7 @@ import com.margelo.nitro.${replaceHyphen(moduleName)}.Hybrid${toPascalCase(
     moduleName
 )}Spec
 
-class Hybrid${toPascalCase(moduleName)}: Hybrid${toPascalCase(moduleName)}Spec() {
-    override val memorySize: Long
-        get() = 5
-    
+class Hybrid${toPascalCase(moduleName)}: Hybrid${toPascalCase(moduleName)}Spec() {    
     override fun ${funcName}(num1: Double, num2: Double): Double {
         return num1 + num2
     }
diff --git a/src/file-generators/android-file-generator.ts b/src/file-generators/android-file-generator.ts
@@ -175,7 +175,7 @@ export class AndroidFileGenerator implements FileGenerator {
         )
 
         const replacements = {
-            [`com.${ANDROID_NAME_SPACE_TAG}`]: this.androidPackageName,
+            [ANDROID_NAME_SPACE_TAG]: replaceHyphen(config.moduleName),
             [`${ANDROID_CXX_LIB_NAME_TAG}Package`]:
                 androidPackageFile.split('.')[0],
             [ANDROID_CXX_LIB_NAME_TAG]: toPascalCase(config.moduleName),

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'create-nitro-module': minor
 +---
++
 +feat: upgrade to nitro v0.22.0
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`import com.facebook.react.TurboReactPackage;`
`11`	`11`	`import com.margelo.nitro.core.HybridObject;`
`12`	`12`	`import com.margelo.nitro.core.HybridObjectRegistry;`
	`13`	`+import com.margelo.nitro.$$androidNamespace$$.$$androidCxxLibName$$OnLoad;`
	`14`	`+`
`13`	`15`
`14`	`16`	`import java.util.HashMap;`
`15`	`17`	`import java.util.function.Supplier;`
`@@ -29,6 +31,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`static {`
`32`		`- System.loadLibrary("$$androidCxxLibName$$");`
	`34`	`+ $$androidCxxLibName$$OnLoad.initializeNative();`
`33`	`35`	`}`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ export class AndroidFileGenerator implements FileGenerator {`
`175`	`175`	`)`
`176`	`176`
`177`	`177`	`const replacements = {`
`178`		- [`com.${ANDROID_NAME_SPACE_TAG}`]: this.androidPackageName,
	`178`	`+ [ANDROID_NAME_SPACE_TAG]: replaceHyphen(config.moduleName),`
`179`	`179`	[`${ANDROID_CXX_LIB_NAME_TAG}Package`]:
`180`	`180`	`androidPackageFile.split('.')[0],`
`181`	`181`	`[ANDROID_CXX_LIB_NAME_TAG]: toPascalCase(config.moduleName),`