brick-module 0.5.0 → 0.5.2

package/android/brick_modules.gradle

@@ -255,6 +255,28 @@ ext.applyBrickModules = { settings, args ->
         gradle.rootProject.ext.brickCodegenRanInBuild =
             settings.ext.has("brickCodegenRan") ? settings.ext.brickCodegenRan : false
         configureAppProject(gradle)
+        // The compileSdkVersion in brick-codegen's generated build.gradle may be lower
+        // than the host project's compileSdk, so override it to match.
+        gradle.rootProject.subprojects { subproj ->
+            if (subproj.name == 'brick-codegen') {
+                subproj.afterEvaluate {
+                    try {
+                        def hostCompileSdk = 35
+                        // Try to read compileSdk from the host app project
+                        try {
+                            def appProj = gradle.rootProject.findProject(":${appProjectName}")
+                            if (appProj?.hasProperty('android')) {
+                                hostCompileSdk = appProj.android.compileSdk ?: 35
+                            }
+                        } catch (Exception ignored) {}
+                        subproj.android.compileSdkVersion hostCompileSdk
+                    } catch (Exception e) {
+                        println("🧱 BrickModules: Failed to override brick-codegen compileSdk: ${e.message}")
+                    }
+                }
+            }
+        }
+
         // Inline: ensure RN autolinking doesn't fail due to missing codegen/jni for brick-module
         gradle.rootProject.subprojects { subproj ->
             if (subproj.name == 'brick-module') {

package/android/src/main/java/com/brickmodule/BrickModulePackage.kt

@@ -8,19 +8,20 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
+import android.util.Log
 import java.util.HashMap
 
 class BrickModulePackage : TurboReactPackage() {
 
     init {
-        println("🔍 BrickModulePackage initialized")
+        Log.d(TAG, "BrickModulePackage initialized")
     }
 
     override fun getModule(
             name: String,
             reactContext: ReactApplicationContext,
     ): NativeModule? {
-        println("🔍 BrickModulePackage.getModule called with name: $name")
+        Log.d(TAG, "getModule called with name: $name")
         return if (name == "BrickModule") {
             // Try to find the generated BrickModule class
             try {
@@ -30,8 +31,8 @@ class BrickModulePackage : TurboReactPackage() {
                         Class.forName("com.brickmodule.codegen.BrickModule", true, classLoader)
                 val constructor = generatedClass.getConstructor(ReactContext::class.java)
                 val instance = constructor.newInstance(reactContext) as NativeModule
-                println("✅ BrickModule successfully created: ${instance.javaClass.name}")
-                println("BrickModule ${instance.javaClass.methods.map { it.name }}")
+                Log.d(TAG, "BrickModule successfully created: ${instance.javaClass.name}")
+                Log.d(TAG, "BrickModule ${instance.javaClass.methods.map { it.name }}")
                 instance
             } catch (e: ClassNotFoundException) {
                 // Try with current thread class loader as fallback
@@ -41,8 +42,9 @@ class BrickModulePackage : TurboReactPackage() {
                             Class.forName("com.brickmodule.BrickModule", true, currentClassLoader)
                     val constructor = generatedClass.getConstructor(ReactContext::class.java)
                     val instance = constructor.newInstance(reactContext) as NativeModule
-                    println(
-                            "✅ BrickModule successfully created with thread classloader: ${instance.javaClass.name}"
+                    Log.d(
+                        TAG,
+                        "BrickModule successfully created with thread classloader: ${instance.javaClass.name}"
                     )
                     instance
                 } catch (e2: Exception) {
@@ -64,7 +66,7 @@ class BrickModulePackage : TurboReactPackage() {
     }
 
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider {
-        println("🔍 BrickModulePackage.getReactModuleInfoProvider called")
+        Log.d(TAG, "getReactModuleInfoProvider called")
         val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
         // Force TurboModule to true since we're using NativeBrickModuleSpec
         val isTurboModule: Boolean = true
@@ -82,6 +84,7 @@ class BrickModulePackage : TurboReactPackage() {
     }
 
     companion object {
+        private const val TAG = "BrickModulePackage"
         const val NAME = "BrickModulePackage"
     }
 }

package/android/src/main/java/com/brickmodule/BrickModuleRegistry.kt

@@ -1,5 +1,6 @@
 package com.brickmodule
 
+import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import java.util.concurrent.ConcurrentHashMap
 
@@ -22,8 +23,9 @@ class BrickModuleRegistry {
     fun register(modules: List<BrickModuleBase>) {
         modules.forEach { module -> registerSingleModule(module) }
         isRegistered = true
-        println(
-                "✅ BrickModuleRegistry: Successfully registered ${modules.size} modules (total: ${this.modules.size})"
+        Log.d(
+            TAG,
+            "Successfully registered ${modules.size} modules (total: ${this.modules.size})"
         )
     }
 
@@ -36,13 +38,13 @@ class BrickModuleRegistry {
     @Synchronized
     fun push(module: BrickModuleBase) {
         registerSingleModule(module)
-        println("✅ BrickModuleRegistry: Module pushed successfully (total: ${modules.size})")
+        Log.d(TAG, "Module pushed successfully (total: ${modules.size})")
     }
 
     private fun registerSingleModule(module: BrickModuleBase) {
         val moduleName = module.moduleName
         if (moduleName.isEmpty()) {
-            println("❌ BrickModuleRegistry: Module has empty moduleName")
+            Log.e(TAG, "Module has empty moduleName")
             return
         }
 
@@ -51,9 +53,9 @@ class BrickModuleRegistry {
         modules[moduleName] = module
 
         if (isUpdate) {
-            println("🔄 BrickModuleRegistry: Module '$moduleName' updated (replaced existing)")
+            Log.d(TAG, "Module '$moduleName' updated (replaced existing)")
         } else {
-            println("📦 BrickModuleRegistry: Registered module '$moduleName'")
+            Log.d(TAG, "Registered module '$moduleName'")
         }
     }
 
@@ -85,8 +87,10 @@ class BrickModuleRegistry {
                 // Get constants directly from BrickModuleBase
                 allConstants[moduleName] = module.getConstants()
             } catch (e: Exception) {
-                println(
-                        "❌ BrickModuleRegistry: Failed to get constants for $moduleName: ${e.message}"
+                Log.e(
+                    TAG,
+                    "Failed to get constants for $moduleName: ${e.message}",
+                    e
                 )
             }
         }
@@ -106,7 +110,7 @@ class BrickModuleRegistry {
         modules.clear()
         isRegistered = false
 
-        println("🧹 BrickModuleRegistry: Unregistered $count modules")
+        Log.d(TAG, "Unregistered $count modules")
     }
 
     /** Clears all registered modules (for testing purposes only) */
@@ -114,6 +118,10 @@ class BrickModuleRegistry {
     fun clearRegistry() {
         modules.clear()
         isRegistered = false
-        println("🧹 BrickModuleRegistry: Registry cleared")
+        Log.d(TAG, "Registry cleared")
+    }
+    
+    companion object {
+        private const val TAG = "BrickModuleRegistry"
     }
 }

package/android/src/main/java/com/brickmodule/EventDataConverter.kt

@@ -1,5 +1,6 @@
 package com.brickmodule
 
+import android.util.Log
 import com.facebook.react.bridge.*
 
 /**
@@ -8,6 +9,8 @@ import com.facebook.react.bridge.*
  */
 object EventDataConverter {
 
+    private const val TAG = "EventDataConverter"
+
     private fun isNullSentinel(value: Any?): Boolean {
         return value is Null ||
                 (value != null && value.javaClass.name == "com.brickmodule.Null") ||
@@ -37,15 +40,16 @@ object EventDataConverter {
                     is List<*> -> convertList(data)
                     is Array<*> -> convertList(data.toList())
                     else -> {
-                        println(
-                                "⚠️ EventDataConverter: Unsupported data type ${data.javaClass.simpleName}, converting to string"
+                        Log.w(
+                            TAG,
+                            "Unsupported data type ${data.javaClass.simpleName}, converting to string"
                         )
                         data.toString()
                     }
                 }
             }
         } catch (e: Exception) {
-            println("❌ EventDataConverter: Failed to convert data: ${e.message}")
+            Log.e(TAG, "Failed to convert data: ${e.message}", e)
             null
         }
     }
@@ -78,7 +82,7 @@ object EventDataConverter {
 
             writableMap
         } catch (e: Exception) {
-            println("❌ EventDataConverter: Failed to convert map: ${e.message}")
+            Log.e(TAG, "Failed to convert map: ${e.message}", e)
             null
         }
     }
@@ -108,7 +112,7 @@ object EventDataConverter {
 
             writableArray
         } catch (e: Exception) {
-            println("❌ EventDataConverter: Failed to convert list: ${e.message}")
+            Log.e(TAG, "Failed to convert list: ${e.message}", e)
             null
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brick-module",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Better React Native native module development",
   "type": "module",
   "main": "dist/index.js",
@@ -58,7 +58,7 @@
     "brick-codegen": "./bin/brick-codegen.js"
   },
   "dependencies": {
-    "brick-codegen": "0.5.0"
+    "brick-codegen": "0.5.2"
   },
   "peerDependencies": {
     "react": ">=18.2.0",