feat: fabric support

android/build-legacy.gradle

@@ -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")
+        }
+    }
 }

android/build.gradle.kts

@@ -1,10 +1,21 @@
+val usercentricsVersion = "2.23.3"
+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.3"
-val reactNativeVersion = "0.79.6"
+if (isNewArchitectureEnabled) {
+    apply(plugin = "com.facebook.react")
+}
 
 android {
     namespace = "com.usercentrics.reactnative"
@@ -16,15 +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 {
@@ -35,14 +45,12 @@ 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 {
@@ -54,23 +62,33 @@ android {
             useLegacyPackaging = false
         }
     }
+
 }
 
 dependencies {
     implementation("com.facebook.react:react-android:$reactNativeVersion")
     implementation("com.usercentrics.sdk:usercentrics-ui:$usercentricsVersion")
 
-    // Unit tests (JVM)
+    // 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")
-    testImplementation("com.facebook.react:react-android:$reactNativeVersion")
 
-    // Instrumented tests (Android)
+    // 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")
+        }
+    }
 }

android/gradle.properties

@@ -2,6 +2,4 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
-
-hermesEnabled=true
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

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

@@ -1,22 +1,51 @@
 package com.usercentrics.reactnative
 
-import com.facebook.react.ReactPackage
+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.facebook.react.turbomodule.core.interfaces.TurboModule
 import com.usercentrics.reactnative.api.UsercentricsProxyImpl
 
-class RNUsercentricsPackage : ReactPackage {
+@ReactModuleList(
+    nativeModules = [
+        RNUsercentricsModule::class,
+    ],
+)
+class RNUsercentricsPackage : TurboReactPackage() {
 
     private val usercentricsProxy = UsercentricsProxyImpl()
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): MutableList<ViewManager<*, *>> {
-        return mutableListOf()
+    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 createNativeModules(reactContext: ReactApplicationContext): MutableList<NativeModule> {
-        val reactContextProvider = ReactContextProviderImpl(reactContext)
-        return mutableListOf(RNUsercentricsModule(reactContext, usercentricsProxy, reactContextProvider))
+    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()
     }
 }

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}
+)

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
+
+
+

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
+