brick-module 0.1.12 → 0.1.13

package/android/brick_modules.gradle

@@ -217,6 +217,81 @@ ext.applyBrickModules = { settings, args ->
         gradle.rootProject.ext.brickProjectRoot = projectRoot
         gradle.rootProject.ext.brickAppProjectName = appProjectName
         configureAppProject(gradle)
+        // Inline: ensure RN autolinking doesn't fail due to missing codegen/jni for brick-module
+        gradle.rootProject.subprojects { subproj ->
+            if (subproj.name == 'brick-module') {
+                subproj.afterEvaluate {
+                    try {
+                        def dummyCMake = '''# Dummy CMakeLists.txt for React Native autolinking
+# This file is required by React Native's autolinking system
+# The actual TurboModule implementation is handled by brick-codegen in user projects
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# Header for BrickModuleSpec. When included by RN autolinking (no BRICKMODULESPEC_DUMMY_IMPL),
+# include RN headers and provide an inline nullptr-returning implementation. When building the
+# dummy static library (with BRICKMODULESPEC_DUMMY_IMPL), avoid depending on RN headers.
+file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/BrickModuleSpec.h [[
+/** Auto-generated dummy header for BrickModuleSpec */
+#pragma once
+#include <memory>
+#include <string>
+namespace facebook { namespace react {
+
+#ifndef BRICKMODULESPEC_DUMMY_IMPL
+#include <ReactCommon/JavaTurboModule.h>
+inline std::shared_ptr<TurboModule> BrickModuleSpec_ModuleProvider(
+  const std::string & /*moduleName*/, const JavaTurboModule::InitParams & /*params*/) {
+  return nullptr;
+}
+#else
+class TurboModule;     // forward declaration
+class JavaTurboModule; // forward declaration
+#endif
+
+}} // namespace facebook::react
+]])
+
+# Create a trivial compilation unit for the static library
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp [[
+// Dummy TU for react_codegen_BrickModuleSpec
+int brick_codegen_BrickModuleSpec_dummy = 0;
+]])
+
+# Create an empty static library to satisfy React Native's build system
+add_library(react_codegen_BrickModuleSpec STATIC ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
+
+# Set necessary properties
+target_include_directories(react_codegen_BrickModuleSpec PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_compile_definitions(react_codegen_BrickModuleSpec PRIVATE BRICKMODULESPEC_DUMMY_IMPL=1)
+'''
+
+                        def prepareTask = subproj.tasks.findByName('prepareBrickModuleAutolinkCMake') ?: subproj.tasks.create('prepareBrickModuleAutolinkCMake') {
+                            group = 'brick-module'
+                            description = 'Creates a dummy CMakeLists.txt so RN autolinking can add_subdirectory for brick-module without error.'
+                            doLast {
+                                def jniDir = new File(subproj.buildDir, 'generated/source/codegen/jni')
+                                if (!jniDir.exists()) {
+                                    jniDir.mkdirs()
+                                }
+                                def cmakeFile = new File(jniDir, 'CMakeLists.txt')
+                                cmakeFile.text = dummyCMake
+                                println("🧱 BrickModules: Prepared stub CMake at ${cmakeFile}")
+                            }
+                        }
+
+                        if (subproj.tasks.findByName('preBuild')) {
+                            subproj.preBuild.dependsOn(prepareTask)
+                        }
+                    } catch (Exception e) {
+                        println("🧱 BrickModules: Failed to configure CMake stub for brick-module: ${e.message}")
+                    }
+                }
+            }
+        }
+
+        // Note: We only wire the dependency for the app project below to avoid
+        // introducing cycles across all subprojects.
     }
 }
 
@@ -227,6 +302,24 @@ def configureAppProject(gradle) {
         if (project.name == appProjectName) {
             project.afterEvaluate {
                 configureBrickModules(project)
+
+                // If brick-module exists, make sure native-related tasks run after stub CMake is prepared
+                def hasBrickModule = gradle.rootProject.subprojects.find { it.name == 'brick-module' } != null
+                if (hasBrickModule) {
+                    try {
+                        // Run early in the build
+                        project.preBuild.dependsOn(":brick-module:prepareBrickModuleAutolinkCMake")
+                        // Also guard native/CMake tasks
+                        project.tasks.matching { t ->
+                            def n = t.name.toLowerCase()
+                            return n.contains('extern') || n.contains('cmake')
+                        }.all { t ->
+                            t.dependsOn(":brick-module:prepareBrickModuleAutolinkCMake")
+                        }
+                    } catch (Exception e) {
+                        println("🧱 BrickModules: Failed to wire CMake stub dependency: ${e.message}")
+                    }
+                }
             }
         }
     }
@@ -396,4 +489,3 @@ ${moduleNames}
 }
 """
 }
-

package/android/build.gradle

@@ -28,9 +28,9 @@ apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply from: "$projectDir/react-native-helpers.gradle"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+
+apply plugin: "com.facebook.react"
+
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["BrickModule_" + name]
@@ -84,8 +84,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 }
 
@@ -105,7 +105,7 @@ dependencies {
     api 'com.facebook.react:react-android:+'
   } else {
     // noinspection GradleDynamicVersion
-    api 'com.facebook.react:react-native:+'
+    api 'com.facebook.react:react-android:0.81.1'
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
@@ -117,12 +117,12 @@ task cleanButPreserveCMakeLists {
   doFirst {
     def cmakeFile = file("$buildDir/generated/source/codegen/jni/CMakeLists.txt")
     def cmakeContent = ""
-    
+
     // Save CMakeLists.txt content if it exists
     if (cmakeFile.exists()) {
       cmakeContent = cmakeFile.text
     }
-    
+
     // Store in project property for restoration
     project.ext.savedCMakeContent = cmakeContent
   }
@@ -131,7 +131,7 @@ task cleanButPreserveCMakeLists {
 // Override the clean task to preserve CMakeLists.txt
 clean {
   dependsOn cleanButPreserveCMakeLists
-  
+
   doLast {
     // Restore CMakeLists.txt after clean
     if (project.hasProperty('savedCMakeContent') && project.savedCMakeContent) {

package/package.json

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