Add CMake

package/android/CMakeLists.txt

@@ -0,0 +1,51 @@
+project(RNFilament)
+cmake_minimum_required(VERSION 3.9.0)
+
+set(PACKAGE_NAME "RNFilament")
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 17)
+
+# Third party libraries (Prefabs)
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_library(LOG_LIB log)
+
+# Add react-native-filament sources
+add_library(
+        ${PACKAGE_NAME}
+        SHARED
+        # Shared C++
+        ../cpp/MutableRawBuffer.cpp
+        ../cpp/FilamentProxy.cpp
+        ../cpp/jsi/Promise.cpp
+        # Java JNI
+        src/main/cpp/AndroidFilamentProxy.cpp
+        src/main/cpp/Filament.cpp
+        src/main/cpp/FilamentInstaller.cpp
+        src/main/cpp/java-bindings/JFilamentProxy.cpp
+)
+
+# Header Search Paths (includes)
+target_include_directories(
+        ${PACKAGE_NAME}
+        PRIVATE
+        "../cpp"
+        "src/main/cpp"
+        "src/main/cpp/java-bindings"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule" # <-- CallInvokerHolder JNI wrapper
+)
+
+# Link everything together
+target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}                          # <-- Logcat logger
+        android                             # <-- Android JNI core
+        ReactAndroid::jsi                   # <-- RN: JSI
+        ReactAndroid::reactnativejni        # <-- RN: React Native JNI bindings
+        fbjni::fbjni                        # <-- fbjni
+        GLESv2                              # <-- OpenGL (Core)
+        EGL                                 # <-- OpenGL (EGL)
+)

package/android/build.gradle

@@ -1,3 +1,5 @@
+import java.nio.file.Paths
+
 buildscript {
   repositories {
     google()
@@ -36,9 +38,26 @@ def supportsNamespace() {
   return (major == 7 && minor >= 3) || major >= 8
 }
 
+static def findNodeModules(baseDir) {
+  def basePath = baseDir.toPath().normalize()
+  // Node"s module resolution algorithm searches up to the root directory,
+  // after which the base path will be null
+  while (basePath) {
+    def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
+    def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
+    if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
+      return nodeModulesPath.toString()
+    }
+    basePath = basePath.getParent()
+  }
+  throw new GradleException("react-native-filament: Failed to find node_modules/ path!")
+}
+
+def nodeModules = findNodeModules(projectDir)
+
 android {
   if (supportsNamespace()) {
-    namespace "com.filament"
+    namespace "com.margelo.filament"
 
     sourceSets {
       main {
@@ -54,10 +73,24 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
+    externalNativeBuild {
+      cmake {
+        cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
+        arguments "-DANDROID_STL=c++_shared",
+                "-DNODE_MODULES_DIR=${nodeModules}"
+      }
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
   }
 
   buildFeatures {
     buildConfig true
+    prefab true
   }
 
   buildTypes {
@@ -107,6 +140,21 @@ if (isNewArchitectureEnabled()) {
   react {
     jsRootDir = file("../src/")
     libraryName = "FilamentView"
-    codegenJavaPackageName = "com.filament"
+    codegenJavaPackageName = "com.margelo.filament"
+  }
+}
+
+task deleteCmakeCache() {
+  doFirst {
+    delete "${projectDir}/.cxx"
+    delete "${nodeModules}/react-native-filament/android/.cxx"
+    delete "${nodeModules}/react-native-filament/android/build"
+  }
+}
+
+tasks.configureEach { task ->
+  // C++ clean
+  if (task.name.contains("clean")) {
+    task.dependsOn(deleteCmakeCache)
   }
 }

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.filament">
+          package="com.margelo.filament">
 </manifest>

package/android/src/main/cpp/AndroidFilamentProxy.cpp

@@ -8,8 +8,8 @@ namespace margelo {
 
 using namespace facebook;
 
-explicit AndroidFilamentProxy::AndroidFilamentProxy(jni::alias_ref<JFilamentProxy> filamentProxy):
-  _filamentProxy(jni::make_global(filamentProxy)) { }
+explicit AndroidFilamentProxy::AndroidFilamentProxy(jni::alias_ref<JFilamentProxy> filamentProxy)
+    : _filamentProxy(jni::make_global(filamentProxy)) {}
 
 AndroidFilamentProxy::~AndroidFilamentProxy() {
   // Hermes GC might destroy HostObjects on an arbitrary Thread which might not be

package/android/src/main/cpp/Filament.cpp

@@ -2,7 +2,5 @@
 #include <jni.h>
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return facebook::jni::initialize(vm, [] {
-    margelo::FilamentInstaller::registerNatives();
-  });
+  return facebook::jni::initialize(vm, [] { margelo::FilamentInstaller::registerNatives(); });
 }

package/android/src/main/cpp/java-bindings/JFilamentProxy.cpp

@@ -9,12 +9,9 @@ namespace margelo {
 
 using namespace facebook;
 
-
-JFilamentProxy::JFilamentProxy(const jni::alias_ref<JFilamentProxy::jhybridobject>& javaThis,
-                               jsi::Runtime* runtime,
-                               const std::shared_ptr<facebook::react::CallInvoker>& callInvoker):
-                              _javaPart(make_global(javaThis)), _runtime(runtime), _callInvoker(callInvoker) { }
-
+JFilamentProxy::JFilamentProxy(const jni::alias_ref<JFilamentProxy::jhybridobject>& javaThis, jsi::Runtime* runtime,
+                               const std::shared_ptr<facebook::react::CallInvoker>& callInvoker)
+    : _javaPart(make_global(javaThis)), _runtime(runtime), _callInvoker(callInvoker) {}
 
 JFilamentProxy::~JFilamentProxy() {
   // TODO(hanno): Cleanup?
@@ -29,9 +26,9 @@ void JFilamentProxy::registerNatives() {
   registerHybrid({makeNativeMethod("initHybrid", JFilamentProxy::initHybrid)});
 }
 
-jni::local_ref<JFilamentProxy::jhybriddata> JFilamentProxy::initHybrid(alias_ref<jhybridobject> jThis,
-                                                                       jlong jsRuntimePointer,
-                                                                       jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder) {
+jni::local_ref<JFilamentProxy::jhybriddata>
+JFilamentProxy::initHybrid(alias_ref<jhybridobject> jThis, jlong jsRuntimePointer,
+                           jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder) {
   __android_log_write(ANDROID_LOG_INFO, TAG, "Initializing JFilamentProxy...");
 
   // cast from JNI hybrid objects to C++ instances

package/android/src/main/cpp/java-bindings/JFilamentProxy.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <ReactCommon/CallInvokerHolder.h>
 #include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <jni.h>
-#include <ReactCommon/CallInvokerHolder.h>
+#include <jsi/jsi.h>
 
 namespace margelo {
 
@@ -35,12 +35,10 @@ class JFilamentProxy : public jni::HybridClass<JFilamentProxy> {
   static auto constexpr kJavaDescriptor = "Lcom/margelo/filament/FilamentProxy;";
 
 private:
-  explicit JFilamentProxy(const jni::alias_ref<JFilamentProxy::jhybridobject>& javaThis,
-                          jsi::Runtime* jsRuntime,
+  explicit JFilamentProxy(const jni::alias_ref<JFilamentProxy::jhybridobject>& javaThis, jsi::Runtime* jsRuntime,
                           const std::shared_ptr<facebook::react::CallInvoker>& jsCallInvoker);
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> javaThis,
-                                                jlong jsRuntimePointer,
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> javaThis, jlong jsRuntimePointer,
                                                 jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder);
 };
 
-} // namespace vision
+} // namespace margelo

package/android/src/main/java/com/margelo/filament/FilamentProxy.java

@@ -0,0 +1,5 @@
+package com.margelo.filament;
+
+class FilamentProxy {
+
+}

package/android/src/main/java/com/margelo/filament/FilamentView.java

@@ -1,4 +1,4 @@
-package com.filament;
+package com.margelo.filament;
 
 import androidx.annotation.Nullable;
 

package/android/src/main/java/com/margelo/filament/FilamentViewManager.java

@@ -1,4 +1,4 @@
-package com.filament;
+package com.margelo.filament;
 
 import android.graphics.Color;
 

package/android/src/main/java/com/margelo/filament/FilamentViewPackage.java

@@ -1,5 +1,5 @@
 
-package com.filament;
+package com.margelo.filament;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;

package/android/src/newarch/FilamentViewManagerSpec.java

@@ -1,4 +1,4 @@
-package com.filament;
+package com.margelo.filament;
 
 import android.view.View;
 

package/android/src/oldarch/FilamentViewManagerSpec.java

@@ -1,4 +1,4 @@
-package com.filament;
+package com.margelo.filament;
 
 import android.view.View;
 

package/cpp/FilamentProxy.cpp

@@ -5,10 +5,10 @@
 #include "FilamentProxy.h"
 #include <jsi/jsi.h>
 
+#include "jsi/Promise.h"
 #include <memory>
 #include <string>
 #include <vector>
-#include "jsi/Promise.h"
 
 namespace margelo {
 

package/cpp/FilamentProxy.h

@@ -26,4 +26,4 @@ class FilamentProxy : public jsi::HostObject {
   jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override;
 };
 
-} // namespace vision
+} // namespace margelo

package/cpp/jsi/Promise.cpp

@@ -11,18 +11,15 @@ using namespace facebook;
 Promise::Promise(jsi::Runtime& runtime, jsi::Value resolver, jsi::Value rejecter)
     : runtime(runtime), _resolver(std::move(resolver)), _rejecter(std::move(rejecter)) {}
 
-jsi::Value Promise::createPromise(jsi::Runtime& runtime,
-                                  std::function<void(std::shared_ptr<Promise> promise)> run) {
+jsi::Value Promise::createPromise(jsi::Runtime& runtime, std::function<void(std::shared_ptr<Promise> promise)> run) {
   // Get Promise ctor from global
   auto promiseCtor = runtime.global().getPropertyAsFunction(runtime, "Promise");
 
   auto promiseCallback = jsi::Function::createFromHostFunction(
       runtime, jsi::PropNameID::forUtf8(runtime, "PromiseCallback"), 2,
-      [=](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments,
-          size_t count) -> jsi::Value {
+      [=](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count) -> jsi::Value {
         // Call function
-        auto promise = std::make_shared<Promise>(runtime, arguments[0].asObject(runtime),
-                                                 arguments[1].asObject(runtime));
+        auto promise = std::make_shared<Promise>(runtime, arguments[0].asObject(runtime), arguments[1].asObject(runtime));
         run(promise);
 
         return jsi::Value::undefined();

package/cpp/jsi/Promise.h

@@ -26,8 +26,7 @@ class Promise {
   /**
    Create a new Promise and runs the given `run` function.
    */
-  static jsi::Value createPromise(jsi::Runtime& runtime,
-                                  std::function<void(std::shared_ptr<Promise> promise)> run);
+  static jsi::Value createPromise(jsi::Runtime& runtime, std::function<void(std::shared_ptr<Promise> promise)> run);
 };
 
 } // namespace margelo

package/example/android/app/build.gradle

@@ -74,9 +74,9 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
-    namespace "com.filamentexample"
+    namespace "com.margelo.filamentexample"
     defaultConfig {
-        applicationId "com.filamentexample"
+        applicationId "com.margelo.filamentexample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

package/example/android/app/src/main/java/com/filamentexample/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.filamentexample
+package com.margelo.filamentexample
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate

package/example/android/app/src/main/java/com/filamentexample/MainApplication.kt

@@ -1,4 +1,4 @@
-package com.filamentexample
+package com.margelo.filamentexample
 
 import android.app.Application
 import com.facebook.react.PackageList

package/example/ios/.xcode.env.local

@@ -0,0 +1,2 @@
+export NODE_BINARY=/Users/mrousavy/.nvm/versions/node/v18.17.0/bin/node
+

package/example/ios/FilamentExample.xcodeproj/project.pbxproj

@@ -544,7 +544,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -572,14 +572,21 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = true;
 			};
 			name = Debug;
 		};
@@ -616,7 +623,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -636,14 +643,21 @@
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;