refactor: use create-react-native-library nitro init

Author: HayesGordon

CONTRIBUTING.md

@@ -19,6 +19,21 @@ yarn
 
 > Since the project relies on Yarn workspaces, you cannot use [`npm`](https://github.com/npm/cli) for development.
 
+This project uses Nitro Modules. If you're not familiar with how Nitro works, make sure to check the [Nitro Modules Docs](https://nitro.margelo.com/).
+
+You need to run [Nitrogen](https://nitro.margelo.com/docs/nitrogen) to generate the boilerplate code required for this project. The example app will not build without this step.
+
+Run **Nitrogen** in following cases:
+
+- When you make changes to any `*.nitro.ts` files.
+- When running the project for the first time (since the generated files are not committed to the repository).
+
+To invoke **Nitrogen**, use the following command:
+
+```sh
+yarn nitrogen
+```
+
 The [example app](/example/) demonstrates usage of the library. You need to run it to test any changes you make.
 
 It is configured to use the local version of the library, so any changes you make to the library's source code will be reflected in the example app. Changes to the library's JavaScript code will be reflected in the example app without a rebuild, but native code changes will require a rebuild of the example app.

README.md

@@ -5,18 +5,20 @@ Rive React Native
 ## Installation
 
 ```sh
-npm install react-native-rive
+npm install react-native-rive react-native-nitro-modules
+
+> `react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).
 ```
 
 ## Usage
 
 
 ```js
-import { RiveView } from "react-native-rive";
+import { multiply } from 'react-native-rive';
 
 // ...
 
-<RiveView color="tomato" />
+const result = multiply(3, 7);
 ```
 
 

Rive.podspec

@@ -13,8 +13,10 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/rive-app/rive-nitro-react-native.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  s.private_header_files = "ios/**/*.h"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+
+  load 'nitrogen/generated/ios/Rive+autolinking.rb'
+  add_nitrogen_files(s)
 
  install_modules_dependencies(s)
 end

android/CMakeLists.txt

@@ -1,15 +1,15 @@
-project(ReactNativeRive)
+project(rive)
 cmake_minimum_required(VERSION 3.9.0)
 
-set(PACKAGE_NAME ReactNativeRive)
+set(PACKAGE_NAME rive)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 20)
 
 # Define C++ library and add all sources
 add_library(${PACKAGE_NAME} SHARED src/main/cpp/cpp-adapter.cpp)
 
 # Add Nitrogen specs :)
-include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/ReactNativeRive+autolinking.cmake)
+include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/rive+autolinking.cmake)
 
 # Set up local includes
 include_directories("src/main/cpp" "../cpp")

android/build.gradle

@@ -20,11 +20,9 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply from: '../nitrogen/generated/android/ReactNativeRive+autolinking.gradle'
-
+apply from: '../nitrogen/generated/android/rive+autolinking.gradle'
 
 apply plugin: "com.facebook.react"
 
@@ -40,13 +38,12 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 
     externalNativeBuild {
       cmake {
-        cppFlags "-frtti -fexceptions -Wall -Wextra -fstack-protector-all"
+        cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"
         arguments "-DANDROID_STL=c++_shared"
-        abiFilters (*reactNativeArchitectures())
+        abiFilters(*reactNativeArchitectures())
 
         buildTypes {
           debug {
@@ -66,32 +63,30 @@ android {
     }
   }
 
+  packagingOptions {
+    excludes = ["META-INF",
+                "META-INF/**",
+                "**/libc++_shared.so",
+                "**/libfbjni.so",
+                "**/libjsi.so",
+                "**/libfolly_json.so",
+                "**/libfolly_runtime.so",
+                "**/libglog.so",
+                "**/libhermes.so",
+                "**/libhermes-executor-debug.so",
+                "**/libhermes_executor.so",
+                "**/libreactnative.so",
+                "**/libreactnativejni.so",
+                "**/libturbomodulejsijni.so",
+                "**/libreact_nativemodule_core.so",
+                "**/libjscexecutor.so"]
+  }
+
   buildFeatures {
     buildConfig true
     prefab true
   }
 
-  packagingOptions {
-     excludes = [
-       "META-INF",
-       "META-INF/**",
-       "**/libc++_shared.so",
-       "**/libfbjni.so",
-       "**/libjsi.so",
-       "**/libfolly_json.so",
-       "**/libfolly_runtime.so",
-       "**/libglog.so",
-       "**/libhermes.so",
-       "**/libhermes-executor-debug.so",
-       "**/libhermes_executor.so",
-       "**/libreactnative.so",
-       "**/libreactnativejni.so",
-       "**/libturbomodulejsijni.so",
-       "**/libreact_nativemodule_core.so",
-       "**/libjscexecutor.so"
-     ]
-   }
-
   buildTypes {
     release {
       minifyEnabled false
@@ -109,11 +104,8 @@ android {
 
   sourceSets {
     main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni",
-        "${project.buildDir}/generated/source/codegen/java"
-      ]
+      java.srcDirs += ["generated/java",
+                       "generated/jni"]
     }
   }
 }
@@ -128,11 +120,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation 'app.rive:rive-android:10.1.3'
   implementation project(":react-native-nitro-modules")
 }
 
-react {
-  jsRootDir = file("../src/")
-  libraryName = "RiveView"
-  codegenJavaPackageName = "com.rive"
-}

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

@@ -1,6 +1,6 @@
 #include <jni.h>
-#include "ReactNativeRiveOnLoad.hpp"
+#include "riveOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::reactnativerive::initialize(vm);
+  return margelo::nitro::rive::initialize(vm);
 }

android/src/main/java/com/margelo/nitro/nitro/Rive.kt

@@ -0,0 +1,10 @@
+package com.margelo.nitro.rive
+  
+import com.facebook.proguard.annotations.DoNotStrip
+
+@DoNotStrip
+class Rive : HybridRiveSpec() {
+  override fun multiply(a: Double, b: Double): Double {
+    return a * b
+  }
+}

android/src/main/java/com/margelo/nitro/reactnativerive/HybridRiveFileFactory.kt

@@ -1,36 +1,23 @@
 package com.rive
 
-import com.facebook.react.BaseReactPackage
-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.model.ReactModuleInfoProvider
-import com.facebook.react.uimanager.ViewManager
-import com.margelo.nitro.reactnativerive.ReactNativeRiveOnLoad
-import java.util.ArrayList
+import com.margelo.nitro.rive.riveOnLoad
 
-class RiveViewPackage : BaseReactPackage() {
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
-    viewManagers.add(RiveViewManager())
-    return viewManagers
-  }
-
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return null
-  }
-
-  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    return ReactModuleInfoProvider { HashMap() }
-  }
+class RivePackage : TurboReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return null
+    }
 
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return emptyList()
-  }
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider { HashMap() }
+    }
 
-  companion object {
-    init {
-      ReactNativeRiveOnLoad.initializeNative()
+    companion object {
+        init {
+            riveOnLoad.initializeNative()
+        }
     }
-  }
 }

android/src/main/java/com/rive/RivePackage.kt

@@ -1,15 +1,4 @@
 package com.rive
 
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-
-class RiveView : View {
-  constructor(context: Context?) : super(context)
-  constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
-  constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(
-    context,
-    attrs,
-    defStyleAttr
-  )
+class RiveView {
 }