@sentiance-react-native/core 6.15.0-rc.4 → 6.15.0-rc.5

package/RNSentianceCore.podspec

@@ -5,7 +5,7 @@ sentiance_sdk_env_var_version = ENV["SENTIANCE_RN_IOS_SDK_VERSION"]
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.15.0-rc.4"
+  s.version      = "6.15.0-rc.5"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/android/build.gradle

@@ -1,14 +1,26 @@
 plugins {
-  id "com.android.library"
+    id "com.android.library"
 }
 
 android {
-  namespace "com.sentiance.react.bridge.core"
+    namespace "com.sentiance.react.bridge.core"
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    def isNewArchEnabled =
+            (project.findProperty('newArchEnabled') ?: "false").toBoolean()
+
+    defaultConfig {
+        consumerProguardFiles 'rules-consumer.pro'
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchEnabled.toString()
+    }
 }
 
 apply from: "$project.projectDir/package-json-reader.gradle"
@@ -19,12 +31,12 @@ applyAndroidVersionsFrom(packageJson)
 def sentianceSdkVersion = getSentianceSdkVersion()
 
 dependencies {
-  implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
-  api("com.sentiance:sdk") { transitive = true }
+    implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
+    api("com.sentiance:sdk") { transitive = true }
 
-  if (findProject(':test-common')) {
-    testImplementation project(':test-common')
-  }
+    if (findProject(':test-common')) {
+        testImplementation project(':test-common')
+    }
 }
 
 applyReactNativeDependency()

package/android/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keepclassmembers class com.sentiance.react.bridge.core.BuildConfig {
+    public static final boolean IS_NEW_ARCHITECTURE_ENABLED;
+}
+-keep class com.sentiance.react.bridge.core.BuildConfig

package/android/src/main/java/com/sentiance/react/bridge/core/common/util/ReactContextProvider.java

@@ -8,22 +8,16 @@ import androidx.annotation.Nullable;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.bridge.ReactContext;
+import com.sentiance.react.bridge.core.BuildConfig;
 
 public final class ReactContextProvider {
 
     private static final String TAG = "ReactNativeContextProvider";
-    private static Boolean isNewArchEnabled = null;
 
-    private final Context mApplicationContext;
     private final ReactApplication mReactApplication;
 
     public ReactContextProvider(Context applicationContext) {
-        mApplicationContext = applicationContext;
-        mReactApplication = (ReactApplication) mApplicationContext;
-
-        if (isNewArchEnabled == null) {
-            isNewArchEnabled = isNewArchEnabled();
-        }
+        mReactApplication = (ReactApplication) applicationContext;
     }
 
     /**
@@ -37,7 +31,7 @@ public final class ReactContextProvider {
      */
     @Nullable
     public ReactContext createReactContext() {
-        if (isNewArchEnabled) {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             return createReactContextInNewArchMode();
         } else {
             return createReactContextInLegacyArchMode();
@@ -75,20 +69,4 @@ public final class ReactContextProvider {
 
         return reactNativeHost.getReactInstanceManager().getCurrentReactContext();
     }
-
-    private boolean isNewArchEnabled() {
-        try {
-            String pkg = mApplicationContext.getPackageName();
-            Class<?> cfg = Class.forName(pkg + ".BuildConfig");
-            return cfg.getField("IS_NEW_ARCHITECTURE_ENABLED").getBoolean(null);
-        } catch (Throwable ignore) { /* app wasn't generated with the flag */ }
-
-        try {
-            Class<?> cfg = Class.forName("com.facebook.react.BuildConfig");
-            return cfg.getField("IS_NEW_ARCHITECTURE_ENABLED").getBoolean(null);
-        } catch (Throwable ignore) {
-        }
-
-        return false;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.15.0-rc.4",
+  "version": "6.15.0-rc.5",
   "description": "The Sentiance Core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",