react-native-unistyles 2.0.0-beta.4 → 2.0.0-beta.6

package/android/CMakeLists.txt

@@ -6,14 +6,10 @@ add_library(unistyles
     SHARED
     ../cxx/UnistylesRuntime.cpp
     ./src/main/cxx/cpp-adapter.cpp
-    ../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
 )
 
 include_directories(
     ../cxx
-    ../node_modules/react-native/React
-    ../node_modules/react-native/React/Base
-    ../node_modules/react-native/ReactCommon/jsi
 )
 
 set_target_properties(unistyles PROPERTIES
@@ -23,6 +19,9 @@ set_target_properties(unistyles PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
+find_package(ReactAndroid REQUIRED CONFIG)
+
 target_link_libraries(unistyles
+    ReactAndroid::jsi
     android
 )

package/android/build.gradle

@@ -15,12 +15,28 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
+def resolveBuildType() {
+    Gradle gradle = getGradle()
+    String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+
+    return tskReqStr.contains('Release') ? 'release' : 'debug'
+}
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 33)
     namespace "com.unistyles"
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+    }
+
+    buildFeatures {
+        prefab true
     }
 
     externalNativeBuild {
@@ -28,6 +44,16 @@ android {
             path "CMakeLists.txt"
         }
     }
+
+    packagingOptions {
+        doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
+        excludes = [
+            "META-INF",
+            "META-INF/**",
+            "**/libjsi.so",
+            "**/libc++_shared.so"
+        ]
+    }
 }
 
 repositories {

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/package.json

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