cloudx-react-native 3.6.1 → 3.8.0

package/android/build.gradle

@@ -1,3 +1,5 @@
+import groovy.json.JsonSlurper
+
 buildscript {
     repositories {
         google()
@@ -8,10 +10,87 @@ buildscript {
     }
 }
 
-def isNewArchitectureEnabled() {
+def resolveReactNativePackageJsonWithNode() {
+    def stdout = new ByteArrayOutputStream()
+    def stderr = new ByteArrayOutputStream()
+
+    try {
+        def result = exec {
+            workingDir rootProject.projectDir
+            commandLine "node", "--print", "require.resolve('react-native/package.json', { paths: [process.cwd()] })"
+            standardOutput = stdout
+            errorOutput = stderr
+            ignoreExitValue = true
+        }
+
+        def resolvedPath = stdout.toString().trim()
+        if (result.exitValue == 0 && resolvedPath) {
+            def packageJson = file(resolvedPath)
+            if (packageJson.exists()) {
+                return packageJson
+            }
+        }
+    } catch (Exception ignored) {
+        return null
+    }
+
+    return null
+}
+
+def resolveReactNativePackageJson() {
+    def packageJson = resolveReactNativePackageJsonWithNode()
+    if (packageJson != null) {
+        return packageJson
+    }
+
+    packageJson = file("$rootProject.projectDir/../node_modules/react-native/package.json")
+    if (packageJson.exists()) {
+        return packageJson
+    }
+
+    logger.warn("CloudX React Native: could not find react-native/package.json; falling back to newArchEnabled.")
+    return null
+}
+
+def getReactNativeVersion() {
+    def packageJson = resolveReactNativePackageJson()
+    if (packageJson == null) {
+        return null
+    }
+
+    def parsedPackageJson = new JsonSlurper().parseText(packageJson.text)
+    return parsedPackageJson.version as String
+}
+
+def isReactNativeNewArchitectureOnly() {
+    def version = getReactNativeVersion()
+    if (version == null) {
+        return false
+    }
+
+    def matcher = version =~ /^(\d+)\.(\d+)\..*$/
+    if (!matcher.matches()) {
+        return false
+    }
+
+    def major = matcher[0][1].toInteger()
+    def minor = matcher[0][2].toInteger()
+    return major > 0 || (major == 0 && minor >= 82)
+}
+
+def isNewArchitectureEnabledByProperty() {
     return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+def isNewArchitectureEnabled() {
+    /*
+     * React Native 0.82+ is New Architecture-only and ignores attempts to opt
+     * back into Legacy Architecture, so CloudX must build its codegen-backed
+     * Android sources for those host apps regardless of the app flag.
+     */
+    return isReactNativeNewArchitectureOnly() || isNewArchitectureEnabledByProperty()
+}
+
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
@@ -54,6 +133,13 @@ android {
         }
     }
 
+    testOptions {
+        unitTests {
+            // android.util.Log is a stub that throws in plain JVM unit tests.
+            returnDefaultValues = true
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -72,5 +158,9 @@ repositories {
 dependencies {
     implementation "com.facebook.react:react-native:0.76.2"
 
-    implementation "io.cloudx:sdk:4.4.0"
+    implementation "io.cloudx:sdk:4.6.0"
+
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "io.mockk:mockk:1.13.10"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
 }

package/android/src/main/java/com/cloudxreactnative/CloudXAdViewEvent.kt

@@ -10,11 +10,11 @@ import com.facebook.react.uimanager.events.Event
 class CloudXAdViewEvent(
     surfaceId: Int,
     viewId: Int,
-    private val eventName: String,
+    private val registrationName: String,
     private val payload: WritableMap,
 ) : Event<CloudXAdViewEvent>(surfaceId, viewId) {
 
-    override fun getEventName(): String = eventName
+    override fun getEventName(): String = registrationName
 
     override fun getEventData(): WritableMap = payload
 

package/android/src/main/java/com/cloudxreactnative/CloudXAdViewManagerImpl.kt

@@ -15,12 +15,12 @@ object CloudXAdViewManagerImpl {
     fun createViewInstance(reactContext: ThemedReactContext): CloudXAdView = CloudXAdView(reactContext)
 
     fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
-        MapBuilder.builder<String, Any>()
-            .put(CloudXAdEvents.ON_AD_VIEW_LOADED_EVENT, eventRegistration(CloudXAdEvents.ON_AD_VIEW_LOADED_EVENT))
-            .put(CloudXAdEvents.ON_AD_VIEW_LOAD_FAILED_EVENT, eventRegistration(CloudXAdEvents.ON_AD_VIEW_LOAD_FAILED_EVENT))
-            .put(CloudXAdEvents.ON_AD_VIEW_CLICKED_EVENT, eventRegistration(CloudXAdEvents.ON_AD_VIEW_CLICKED_EVENT))
-            .put(CloudXAdEvents.ON_AD_VIEW_REVENUE_PAID_EVENT, eventRegistration(CloudXAdEvents.ON_AD_VIEW_REVENUE_PAID_EVENT))
-            .build()
+        mutableMapOf(
+            CloudXAdEvents.ON_AD_VIEW_LOADED_EVENT to eventRegistration(CloudXAdEvents.ON_AD_VIEW_LOADED_EVENT),
+            CloudXAdEvents.ON_AD_VIEW_LOAD_FAILED_EVENT to eventRegistration(CloudXAdEvents.ON_AD_VIEW_LOAD_FAILED_EVENT),
+            CloudXAdEvents.ON_AD_VIEW_CLICKED_EVENT to eventRegistration(CloudXAdEvents.ON_AD_VIEW_CLICKED_EVENT),
+            CloudXAdEvents.ON_AD_VIEW_REVENUE_PAID_EVENT to eventRegistration(CloudXAdEvents.ON_AD_VIEW_REVENUE_PAID_EVENT),
+        )
 
     private fun eventRegistration(name: String): Map<String, String> = MapBuilder.of("registrationName", name)