upgrade nitro modules 0.35.0

.gitignore

@@ -77,10 +77,3 @@ android/keystores/debug.keystore
 
 # generated by bob
 lib/
-
-# React Native Codegen
-ios/generated
-android/generated
-
-# React Native Nitro Modules
-nitrogen/

android/src/main/cpp/cpp-adapter.cpp

@@ -5,6 +5,7 @@
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *)
 {
-  return facebook::jni::initialize(vm, [=]
-                                   { margelo::nitro::backgroundtimer::initialize(vm); });
+  return facebook::jni::initialize(vm, []() {
+    margelo::nitro::backgroundtimer::registerAllNatives();
+  });
 }

nitrogen/generated/.gitattributes

@@ -0,0 +1 @@
+** linguist-generated=false

nitrogen/generated/android/NitroBackgroundTimer+autolinking.cmake

@@ -0,0 +1,81 @@
+#
+# NitroBackgroundTimer+autolinking.cmake
+# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+# https://github.com/mrousavy/nitro
+# Copyright © Marc Rousavy @ Margelo
+#
+
+# This is a CMake file that adds all files generated by Nitrogen
+# to the current CMake project.
+#
+# To use it, add this to your CMakeLists.txt:
+# ```cmake
+# include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroBackgroundTimer+autolinking.cmake)
+# ```
+
+# Define a flag to check if we are building properly
+add_definitions(-DBUILDING_NITROBACKGROUNDTIMER_WITH_GENERATED_CMAKE_PROJECT)
+
+# Enable Raw Props parsing in react-native (for Nitro Views)
+add_definitions(-DRN_SERIALIZABLE_STATE)
+
+# Add all headers that were generated by Nitrogen
+include_directories(
+  "../nitrogen/generated/shared/c++"
+  "../nitrogen/generated/android/c++"
+  "../nitrogen/generated/android/"
+)
+
+# Add all .cpp sources that were generated by Nitrogen
+target_sources(
+  # CMake project name (Android C++ library name)
+  NitroBackgroundTimer PRIVATE
+  # Autolinking Setup
+  ../nitrogen/generated/android/NitroBackgroundTimerOnLoad.cpp
+  # Shared Nitrogen C++ sources
+  ../nitrogen/generated/shared/c++/HybridNitroBackgroundTimerSpec.cpp
+  # Android-specific Nitrogen C++ sources
+  ../nitrogen/generated/android/c++/JHybridNitroBackgroundTimerSpec.cpp
+)
+
+# From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
+# Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
+target_compile_definitions(
+  NitroBackgroundTimer PRIVATE
+  -DFOLLY_NO_CONFIG=1
+  -DFOLLY_HAVE_CLOCK_GETTIME=1
+  -DFOLLY_USE_LIBCPP=1
+  -DFOLLY_CFG_NO_COROUTINES=1
+  -DFOLLY_MOBILE=1
+  -DFOLLY_HAVE_RECVMMSG=1
+  -DFOLLY_HAVE_PTHREAD=1
+  # Once we target android-23 above, we can comment
+  # the following line. NDK uses GNU style stderror_r() after API 23.
+  -DFOLLY_HAVE_XSI_STRERROR_R=1
+)
+
+# Add all libraries required by the generated specs
+find_package(fbjni REQUIRED) # <-- Used for communication between Java <-> C++
+find_package(ReactAndroid REQUIRED) # <-- Used to set up React Native bindings (e.g. CallInvoker/TurboModule)
+find_package(react-native-nitro-modules REQUIRED) # <-- Used to create all HybridObjects and use the Nitro core library
+
+# Link all libraries together
+target_link_libraries(
+        NitroBackgroundTimer
+        fbjni::fbjni                              # <-- Facebook C++ JNI helpers
+        ReactAndroid::jsi                         # <-- RN: JSI
+        react-native-nitro-modules::NitroModules  # <-- NitroModules Core :)
+)
+
+# Link react-native (different prefab between RN 0.75 and RN 0.76)
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+    target_link_libraries(
+        NitroBackgroundTimer
+        ReactAndroid::reactnative                 # <-- RN: Native Modules umbrella prefab
+    )
+else()
+    target_link_libraries(
+        NitroBackgroundTimer
+        ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
+    )
+endif()

nitrogen/generated/android/NitroBackgroundTimer+autolinking.gradle

@@ -0,0 +1,27 @@
+///
+/// NitroBackgroundTimer+autolinking.gradle
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+/// This is a Gradle file that adds all files generated by Nitrogen
+/// to the current Gradle project.
+///
+/// To use it, add this to your build.gradle:
+/// ```gradle
+/// apply from: '../nitrogen/generated/android/NitroBackgroundTimer+autolinking.gradle'
+/// ```
+
+logger.warn("[NitroModules] 🔥 NitroBackgroundTimer is boosted by nitro!")
+
+android {
+  sourceSets {
+    main {
+      java.srcDirs += [
+        // Nitrogen files
+        "${project.projectDir}/../nitrogen/generated/android/kotlin"
+      ]
+    }
+  }
+}

nitrogen/generated/android/NitroBackgroundTimerOnLoad.cpp

@@ -0,0 +1,56 @@
+///
+/// NitroBackgroundTimerOnLoad.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#ifndef BUILDING_NITROBACKGROUNDTIMER_WITH_GENERATED_CMAKE_PROJECT
+#error NitroBackgroundTimerOnLoad.cpp is not being built with the autogenerated CMakeLists.txt project. Is a different CMakeLists.txt building this?
+#endif
+
+#include "NitroBackgroundTimerOnLoad.hpp"
+
+#include <jni.h>
+#include <fbjni/fbjni.h>
+#include <NitroModules/HybridObjectRegistry.hpp>
+
+#include "JHybridNitroBackgroundTimerSpec.hpp"
+#include "JFunc_void_double.hpp"
+#include <NitroModules/DefaultConstructableObject.hpp>
+
+namespace margelo::nitro::backgroundtimer {
+
+int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::backgroundtimer::registerAllNatives();
+  });
+}
+
+struct JHybridNitroBackgroundTimerSpecImpl: public jni::JavaClass<JHybridNitroBackgroundTimerSpecImpl, JHybridNitroBackgroundTimerSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/backgroundtimer/NitroBackgroundTimer;";
+  static std::shared_ptr<JHybridNitroBackgroundTimerSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridNitroBackgroundTimerSpecImpl::javaobject()>();
+    jni::local_ref<JHybridNitroBackgroundTimerSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridNitroBackgroundTimerSpec();
+  }
+};
+
+void registerAllNatives() {
+  using namespace margelo::nitro;
+  using namespace margelo::nitro::backgroundtimer;
+
+  // Register native JNI methods
+  margelo::nitro::backgroundtimer::JHybridNitroBackgroundTimerSpec::CxxPart::registerNatives();
+  margelo::nitro::backgroundtimer::JFunc_void_double_cxx::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "NitroBackgroundTimer",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridNitroBackgroundTimerSpecImpl::create();
+    }
+  );
+}
+
+} // namespace margelo::nitro::backgroundtimer

nitrogen/generated/android/NitroBackgroundTimerOnLoad.hpp

@@ -0,0 +1,34 @@
+///
+/// NitroBackgroundTimerOnLoad.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#include <jni.h>
+#include <functional>
+#include <NitroModules/NitroDefines.hpp>
+
+namespace margelo::nitro::backgroundtimer {
+
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
+  /**
+   * Register the native (C++) part of NitroBackgroundTimer, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
+   * Example:
+   * ```cpp (cpp-adapter.cpp)
+   * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all NitroBackgroundTimer HybridObjects
+   *     margelo::nitro::backgroundtimer::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
+   * }
+   * ```
+   */
+  void registerAllNatives();
+
+} // namespace margelo::nitro::backgroundtimer

nitrogen/generated/android/c++/JFunc_void_double.hpp

@@ -0,0 +1,75 @@
+///
+/// JFunc_void_double.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include <functional>
+#include <NitroModules/JNICallable.hpp>
+
+namespace margelo::nitro::backgroundtimer {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(id: Double) -> Unit`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_void_double: public jni::JavaClass<JFunc_void_double> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/backgroundtimer/Func_void_double;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_void_double` instance holds through JNI.
+     */
+    void invoke(double id) const {
+      static const auto method = javaClassStatic()->getMethod<void(double /* id */)>("invoke");
+      method(self(), id);
+    }
+  };
+
+  /**
+   * An implementation of Func_void_double that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  class JFunc_void_double_cxx final: public jni::HybridClass<JFunc_void_double_cxx, JFunc_void_double> {
+  public:
+    static jni::local_ref<JFunc_void_double::javaobject> fromCpp(const std::function<void(double /* id */)>& func) {
+      return JFunc_void_double_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_void_double_cxx` instance holds.
+     */
+    void invoke_cxx(double id) {
+      _func(id);
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<void(double /* id */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/backgroundtimer/Func_void_double_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_double_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_void_double_cxx(const std::function<void(double /* id */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<void(double /* id */)> _func;
+  };
+
+} // namespace margelo::nitro::backgroundtimer

nitrogen/generated/android/c++/JHybridNitroBackgroundTimerSpec.cpp

@@ -0,0 +1,68 @@
+///
+/// JHybridNitroBackgroundTimerSpec.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#include "JHybridNitroBackgroundTimerSpec.hpp"
+
+
+
+#include <functional>
+#include "JFunc_void_double.hpp"
+#include <NitroModules/JNICallable.hpp>
+
+namespace margelo::nitro::backgroundtimer {
+
+  std::shared_ptr<JHybridNitroBackgroundTimerSpec> JHybridNitroBackgroundTimerSpec::JavaPart::getJHybridNitroBackgroundTimerSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridNitroBackgroundTimerSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridNitroBackgroundTimerSpec!");
+    }
+    return castHybridObject;
+  }
+
+  jni::local_ref<JHybridNitroBackgroundTimerSpec::CxxPart::jhybriddata> JHybridNitroBackgroundTimerSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
+  }
+
+  std::shared_ptr<JHybridObject> JHybridNitroBackgroundTimerSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridNitroBackgroundTimerSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridNitroBackgroundTimerSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridNitroBackgroundTimerSpec>(castJavaPart);
+  }
+
+  void JHybridNitroBackgroundTimerSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridNitroBackgroundTimerSpec::CxxPart::initHybrid),
+    });
+  }
+
+  // Properties
+
+
+  // Methods
+  double JHybridNitroBackgroundTimerSpec::setTimeout(double id, double duration, const std::function<void(double /* id */)>& callback) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double(double /* id */, double /* duration */, jni::alias_ref<JFunc_void_double::javaobject> /* callback */)>("setTimeout_cxx");
+    auto __result = method(_javaPart, id, duration, JFunc_void_double_cxx::fromCpp(callback));
+    return __result;
+  }
+  void JHybridNitroBackgroundTimerSpec::clearTimeout(double id) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* id */)>("clearTimeout");
+    method(_javaPart, id);
+  }
+  double JHybridNitroBackgroundTimerSpec::setInterval(double id, double interval, const std::function<void(double /* id */)>& callback) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double(double /* id */, double /* interval */, jni::alias_ref<JFunc_void_double::javaobject> /* callback */)>("setInterval_cxx");
+    auto __result = method(_javaPart, id, interval, JFunc_void_double_cxx::fromCpp(callback));
+    return __result;
+  }
+  void JHybridNitroBackgroundTimerSpec::clearInterval(double id) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* id */)>("clearInterval");
+    method(_javaPart, id);
+  }
+
+} // namespace margelo::nitro::backgroundtimer