react-native-unistyles 2.0.0-beta.5 → 2.0.0-beta.7

package/android/build.gradle

@@ -22,11 +22,20 @@ def resolveBuildType() {
     return tskReqStr.contains('Release') ? 'release' : 'debug'
 }
 
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 33)
     namespace "com.unistyles"
 
     defaultConfig {
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         minSdkVersion safeExtGet('minSdkVersion', 21)
         externalNativeBuild {
             cmake {

package/android/src/main/cxx/cpp-adapter.cpp

@@ -88,7 +88,7 @@ extern "C"
 JNIEXPORT void JNICALL
 Java_com_unistyles_UnistylesModule_nativeDestroy(JNIEnv *env, jobject thiz) {
     unistylesRuntime.reset();
-    env->DeleteGlobalRef(unistylesModule);
+    unistylesModule = nullptr;
 }
 
 extern "C"

package/android/src/main/java/com/unistyles/UnistylesModule.kt

@@ -80,16 +80,20 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
             System.loadLibrary("unistyles")
             val config = this.getConfig()
 
-            this.nativeInstall(
-                this.reactApplicationContext.javaScriptContextHolder.get(),
-                config["width"] as Int,
-                config["height"] as Int,
-                config["colorScheme"] as String
-            )
+            this.reactApplicationContext.javaScriptContextHolder?.let {
+                this.nativeInstall(
+                    it.get(),
+                    config["width"] as Int,
+                    config["height"] as Int,
+                    config["colorScheme"] as String
+                )
 
-            Log.i(NAME, "Installed Unistyles \uD83E\uDD84!")
+                Log.i(NAME, "Installed Unistyles \uD83E\uDD84!")
 
-            true
+                return true
+            }
+
+            false
         } catch (e: Exception) {
             false
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",

package/react-native-unistyles.podspec

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
     "cxx/*.{h,cpp}"
   ]
 
-  s.dependency "React-Core"
+  install_modules_dependencies(s)
 end