@usercentrics/react-native-sdk 2.23.2 → 2.24.0

package/README.md

@@ -25,22 +25,22 @@ The Usercentrics Apps SDK is a native Consent Management Platform solution for m
 ## 📋 Requirements
 
 ### Mobile Platforms
-* **Android 5.0 (API 21)** or higher
+* **Android 7.0 (API 24)** or higher
 * **iOS 11** or higher
 
 ### Development Environment
 * **Node.js 18.0+** (LTS recommended)
 * **npm 9.0+** or **Yarn 1.22+**
 * **TypeScript 5.1+**
-* **React 18.2+**
+* **React 18.2+** (React 19 supported)
 * **React Native 0.74.3+** (with Fabric support)
 
 ### Android Development
 * **Java 17+** (OpenJDK or Oracle JDK)
-* **Android SDK** with API 33+ platforms
+* **Android SDK** with API 34+ platforms
 * **Android NDK 25+**
-* **Gradle 8.2+**
-* **Kotlin 1.9.22+**
+* **Gradle 8.2+** (Gradle 8.13 used)
+* **Kotlin 1.9.22+** (Kotlin 2.0.21 recommended)
 * **Android Gradle Plugin 8.2+**
 
 ### iOS Development (macOS only)

package/android/build-legacy.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.23.2"
+def usercentrics_version = "2.24.0"
 version usercentrics_version
 
 buildscript {
@@ -78,4 +78,14 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
+}
+
+// Fix for Gradle task dependency issue with React Native autolinking
+// This ensures that packageReleaseResources task waits for generateReleaseResValues to complete
+afterEvaluate {
+    if (project.tasks.findByName("packageReleaseResources") && project.tasks.findByName(":usercentrics_react-native-sdk:generateReleaseResValues")) {
+        project.tasks.named("packageReleaseResources").configure {
+            dependsOn(":usercentrics_react-native-sdk:generateReleaseResValues")
+        }
+    }
 }

package/android/build.gradle.kts

@@ -1,10 +1,21 @@
+val usercentricsVersion = "2.24.0"
+val reactNativeVersion = "+"
+
+fun BooleanProperty(name: String): Boolean {
+    return project.hasProperty(name) && project.property(name) == "true"
+}
+
+val isNewArchitectureEnabled = BooleanProperty("newArchEnabled")
+val isHermesEnabled = BooleanProperty("hermesEnabled")
+
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    id("kotlin-android")
 }
 
-val usercentricsVersion = "2.23.2"
-val reactNativeVersion = "0.79.6"
+if (isNewArchitectureEnabled) {
+    apply(plugin = "com.facebook.react")
+}
 
 android {
     namespace = "com.usercentrics.reactnative"
@@ -16,11 +27,14 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("proguard-rules.pro")
 
-        val isNewArchEnabled = project.findProperty("newArchEnabled") == "true"
-        val isHermesEnabled = project.findProperty("hermesEnabled") == "true"
-        
-        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchEnabled.toString())
+        // BuildConfig flags
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString())
         buildConfigField("boolean", "IS_HERMES_ENABLED", isHermesEnabled.toString())
+
+        ndk {
+            abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+        }
+
     }
 
     compileOptions {
@@ -31,34 +45,50 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 
     sourceSets {
-        getByName("main").java.srcDirs("src/main/kotlin")
+        getByName("main").java.srcDirs(
+            "src/main/kotlin",
+            "$buildDir/generated/codegen/NativeModules"
+        )
     }
 
     buildFeatures {
         buildConfig = true
     }
 
-    packagingOptions {
+    packaging {
         jniLibs {
             useLegacyPackaging = false
         }
     }
+
 }
 
 dependencies {
     implementation("com.facebook.react:react-android:$reactNativeVersion")
     implementation("com.usercentrics.sdk:usercentrics-ui:$usercentricsVersion")
 
+    // Unit tests
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("io.mockk:mockk:1.13.12")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
+
+    // Instrumented tests
+    androidTestImplementation("com.facebook.react:react-android:$reactNativeVersion")
     androidTestImplementation("io.mockk:mockk-android:1.12.0")
     androidTestImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
     androidTestImplementation("androidx.test:runner:1.4.0")
     androidTestImplementation("androidx.test:rules:1.4.0")
+}
+
+// Fix for Gradle task dependency issue with React Native autolinking
+// This ensures that packageReleaseResources task waits for generateReleaseResValues to complete
+afterEvaluate {
+    if (project.tasks.findByName("packageReleaseResources") != null && project.tasks.findByName(":usercentrics_react-native-sdk:generateReleaseResValues") != null) {
+        project.tasks.named("packageReleaseResources").configure {
+            dependsOn(":usercentrics_react-native-sdk:generateReleaseResValues")
+        }
+    }
 }

package/android/gradle.properties

@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
+
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

package/android/settings.gradle.kts

@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("org.jetbrains.kotlin.android") version "2.1.20"
+        id("org.jetbrains.kotlin.android") version "2.0.21"
     }
 }
 

package/android/src/androidTest/java/com/usercentrics/{reactnativemodule → reactnative}/RNUsercentricsModuleTest.kt

@@ -290,11 +290,11 @@ class RNUsercentricsModuleTest {
         val result = promise.resolveValue as WritableArray
         val consent = result.getMap(0)
 
-        assertEquals(false, consent.getBoolean("status"))
-        assertEquals("ocv9HNX_g", consent.getString("templateId"))
-        assertEquals("Facebook SDK", consent.getString("dataProcessor"))
-        assertEquals(0, consent.getInt("type"))
-        assertEquals("1.0.1", consent.getString("version"))
+        assertEquals(false, consent?.getBoolean("status"))
+        assertEquals("ocv9HNX_g", consent?.getString("templateId"))
+        assertEquals("Facebook SDK", consent?.getString("dataProcessor"))
+        assertEquals(0, consent?.getInt("type"))
+        assertEquals("1.0.1", consent?.getString("version"))
     }
 
     @Test

package/android/src/androidTest/java/com/usercentrics/reactnative/fake/FakePromise.kt

@@ -0,0 +1,73 @@
+package com.usercentrics.reactnativemodule.fake
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.WritableMap
+import java.util.concurrent.CountDownLatch
+
+internal class FakePromise : Promise {
+
+    var resolveValue: Any? = null
+    var rejectThrowable: Throwable? = null
+
+    private val lock = CountDownLatch(1)
+
+    fun await() {
+        lock.await()
+    }
+
+    override fun resolve(value: Any?) {
+        resolveValue = value
+        lock.countDown()
+    }
+
+    override fun reject(code: String, message: String?) {
+        rejectThrowable = RuntimeException("$code: $message")
+        lock.countDown()
+    }
+
+    override fun reject(code: String, throwable: Throwable?) {
+        rejectThrowable = throwable ?: RuntimeException(code)
+        lock.countDown()
+    }
+
+    override fun reject(code: String, message: String?, throwable: Throwable?) {
+        rejectThrowable = throwable ?: RuntimeException("$code: $message")
+        lock.countDown()
+    }
+
+    override fun reject(throwable: Throwable) {
+        rejectThrowable = throwable
+        lock.countDown()
+    }
+
+    override fun reject(throwable: Throwable, userInfo: WritableMap) {
+        rejectThrowable = throwable
+        lock.countDown()
+    }
+
+    override fun reject(code: String, userInfo: WritableMap) {
+        rejectThrowable = RuntimeException("$code: $userInfo")
+        lock.countDown()
+    }
+
+    override fun reject(code: String, throwable: Throwable?, userInfo: WritableMap) {
+        rejectThrowable = throwable
+        lock.countDown()
+    }
+
+    override fun reject(code: String, message: String?, userInfo: WritableMap) {
+        rejectThrowable = RuntimeException("$code: $message")
+        lock.countDown()
+    }
+
+    override fun reject(code: String?, message: String?, throwable: Throwable?, userInfo: WritableMap?) {
+        rejectThrowable = throwable ?: RuntimeException("$code: $message")
+        lock.countDown()
+    }
+
+    @Deprecated("Use reject(code, message) instead")
+    override fun reject(message: String) {
+        rejectThrowable = RuntimeException(message)
+        lock.countDown()
+    }
+}

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/RNUsercentricsModule.kt

@@ -1,8 +1,8 @@
-package com.usercentrics.reactnativeusercentrics
+package com.usercentrics.reactnative
 
 import com.facebook.react.bridge.*
-import com.usercentrics.reactnativeusercentrics.api.UsercentricsProxy
-import com.usercentrics.reactnativeusercentrics.extensions.*
+import com.usercentrics.reactnative.api.UsercentricsProxy
+import com.usercentrics.reactnative.extensions.*
 import com.usercentrics.sdk.UsercentricsAnalyticsEventType
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/RNUsercentricsModuleSpec.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics
+package com.usercentrics.reactnative
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext

package/android/src/main/java/com/usercentrics/reactnative/RNUsercentricsPackage.kt

@@ -0,0 +1,51 @@
+package com.usercentrics.reactnative
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModuleList
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+import com.usercentrics.reactnative.api.UsercentricsProxyImpl
+
+@ReactModuleList(
+    nativeModules = [
+        RNUsercentricsModule::class,
+    ],
+)
+class RNUsercentricsPackage : TurboReactPackage() {
+
+    private val usercentricsProxy = UsercentricsProxyImpl()
+
+    override fun getModule(s: String, reactApplicationContext: ReactApplicationContext): NativeModule? {
+        when (s) {
+            RNUsercentricsModule.NAME -> {
+                val reactContextProvider = ReactContextProviderImpl(reactApplicationContext)
+                return RNUsercentricsModule(reactApplicationContext, usercentricsProxy, reactContextProvider)
+            }
+        }
+        return null
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+        ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            moduleInfos[RNUsercentricsModule.NAME] =
+                ReactModuleInfo(
+                    RNUsercentricsModule.NAME,
+                    RNUsercentricsModule.NAME,
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit
+                    true, // hasConstants
+                    false, // isCxxModule
+                    isTurboModule,
+                )
+            moduleInfos
+        }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
+    }
+}

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/ReactContextProvider.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics
+package com.usercentrics.reactnative
 
 import android.app.Activity
 import android.content.Context

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/ReactContextProviderImpl.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics
+package com.usercentrics.reactnative
 
 import android.app.Activity
 import android.content.Context

package/android/src/main/java/com/usercentrics/reactnative/UCRNFlag.kt

@@ -0,0 +1,4 @@
+package com.usercentrics.reactnative
+
+@Suppress("unused")
+class UCRNFlag

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/api/UsercentricsProxy.kt

@@ -1,9 +1,9 @@
-package com.usercentrics.reactnativeusercentrics.api
+package com.usercentrics.reactnative.api
 
 import android.app.Activity
 import android.content.Context
 import com.facebook.react.bridge.Promise
-import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
+import com.usercentrics.reactnative.extensions.toWritableMap
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
 

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/BannerFontExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import android.content.Context
 import android.content.res.AssetManager

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/BannerSettingsExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import android.content.Context
 import android.graphics.Color

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/CCPADataExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.WritableMap
 import com.usercentrics.ccpa.CCPAData

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/ConsentDisclosureSerializer.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.usercentrics.sdk.v2.settings.data.ConsentDisclosure
 import com.usercentrics.sdk.v2.settings.data.ConsentDisclosureObject

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/ReadableMapExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/TCFDataExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.WritableMap
 import com.usercentrics.sdk.services.tcf.interfaces.TCFData

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UserDecisionExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UserOptionsExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.ReadableMap
 import com.usercentrics.sdk.UsercentricsOptions

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UsercentricsCMPDataExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UsercentricsConsentUserResponseExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UsercentricsReadyStatusExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/usercentrics/{reactnativeusercentrics → reactnative}/extensions/UsercentricsServiceConsentExtensions.kt

@@ -1,4 +1,4 @@
-package com.usercentrics.reactnativeusercentrics.extensions
+package com.usercentrics.reactnative.extensions
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,85 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+# Set library name
+set(LIB_TARGET_NAME react_codegen_RNUsercentricsModule)
+
+# Add compile options
+add_compile_options(
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
+)
+
+# Find source files
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp)
+
+# Create the library
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CUSTOM_SRCS}
+)
+
+# Include directories
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+)
+
+# Link libraries based on React Native version
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+  )
+endif()
+
+# Compile options based on React Native version
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
+else()
+  target_compile_options(
+    ${LIB_TARGET_NAME}
+    PRIVATE
+    -DLOG_TAG=\"ReactNative\"
+    -fexceptions
+    -frtti
+    -std=c++20
+    -Wall
+  )
+endif()
+
+# Additional include directories
+target_include_directories(
+ ${CMAKE_PROJECT_NAME}
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)

package/android/src/main/jni/RNUsercentricsModule.cpp

@@ -0,0 +1,21 @@
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> RNUsercentricsModule_ModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params) {
+  // This is a placeholder implementation
+  // The actual module is implemented in Java/Kotlin
+  return nullptr;
+}
+
+} // namespace react
+} // namespace facebook
+
+
+

package/android/src/main/jni/rn_usercentrics.cpp

@@ -0,0 +1,22 @@
+#include <jni.h>
+#include <jsi/jsi.h>
+#include <fbjni/fbjni.h>
+#include <ReactCommon/CallInvokerHolder.h>
+#include <ReactCommon/TurboModuleUtils.h>
+
+namespace facebook {
+namespace react {
+
+// This is a minimal C++ TurboModule bridge that delegates to the Kotlin implementation
+// The actual TurboModule implementation is in RNUsercentricsModule.kt
+
+extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+    return facebook::jni::initialize(vm, [] {
+        // No additional initialization needed
+        // The Kotlin TurboModule will be loaded via TurboReactPackage
+    });
+}
+
+} // namespace react
+} // namespace facebook
+