Merge branch '@maciejmakowski/audio-context-oscillator'

Author: Maciej Makowski

CODE_OF_CONDUCT.md

@@ -1,15 +1,27 @@
-cmake_minimum_required(VERSION 3.4.1)
-project(AudioContext)
+cmake_minimum_required(VERSION 3.9.0)
+project(react-native-audio-context)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 14)
 
-add_library(react-native-audio-context            SHARED
-            ../cpp/react-native-audio-context.cpp
+add_library(react-native-audio-context
+            SHARED
+            ../cpp/JSIExampleHostObject.cpp
             cpp-adapter.cpp
 )
 
 # Specifies a path to native header files.
 include_directories(
             ../cpp
+            ../node_modules/react-native/ReactCommon/jsi
+)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+
+target_link_libraries(
+  react-native-audio-context
+  ReactAndroid::jsi
+  fbjni::fbjni
+  android
 )

android/CMakeLists.txt

@@ -1,11 +1,13 @@
+import com.android.Version
+
 buildscript {
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:7.2.2"
   }
 }
 
@@ -19,6 +21,7 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
+apply plugin: 'org.jetbrains.kotlin.android'
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
@@ -32,8 +35,8 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["AudioContext_" + name]).toInteger()
 }
 
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+static def supportsNamespace() {
+  def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
   def major = parsed[0].toInteger()
   def minor = parsed[1].toInteger()
 
@@ -64,6 +67,7 @@ android {
       cmake {
         cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
         abiFilters (*reactNativeArchitectures())
+        arguments "-DANDROID_STL=c++_shared"
       }
     }
   }
@@ -76,6 +80,7 @@ android {
 
   buildFeatures {
     buildConfig true
+    prefab true
   }
 
   buildTypes {
@@ -103,6 +108,9 @@ android {
       }
     }
   }
+  kotlinOptions {
+    jvmTarget = '17'
+  }
 }
 
 repositories {
@@ -116,12 +124,14 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+  implementation 'androidx.core:core-ktx:1.13.1'
+  implementation 'com.facebook.fbjni:fbjni:0.6.0'
 }
 
 if (isNewArchitectureEnabled()) {
   react {
     jsRootDir = file("../src/")
-    libraryName = "AudioContext"
+    libraryName = "react-native-audio-context"
     codegenJavaPackageName = "com.audiocontext"
   }
 }

android/build.gradle

@@ -1,8 +1,20 @@
 #include <jni.h>
-#include "react-native-audio-context.h"
+#include <jsi/jsi.h>
+#include "AudioContextHostObject.h"
+
+using namespace facebook;
+
+void install(jsi::Runtime& runtime) {
+    auto hostObject = std::make_shared<audiocontext::AudioContextHostObject>();
+    auto object = jsi::Object::createFromHostObject(runtime, hostObject);
+    runtime.global().setProperty(runtime, "__JSIExampleProxy", std::move(object));
+}
 
 extern "C"
-JNIEXPORT jdouble JNICALL
-Java_com_audiocontext_AudioContextModule_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-    return audiocontext::multiply(a, b);
+JNIEXPORT void JNICALL
+Java_com_audiocontext_jsi_AudioContextModule_00024Companion_nativeInstall(JNIEnv *env, jobject clazz, jlong jsiPtr) {
+    auto runtime = reinterpret_cast<jsi::Runtime*>(jsiPtr);
+    if (runtime) {
+        install(*runtime);
+    }
 }

android/cpp-adapter.cpp

@@ -0,0 +1,26 @@
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+
+namespace audiocontext {
+    using namespace facebook;
+    using namespace facebook::jni;
+
+    class AudioContext: public HybridClass<AudioContext> {
+        public:
+            static auto constexpr kJavaDescriptor =
+                "Lcom/audiocontext/context/AudioContext;";
+
+            static void registerNatives() {
+                javaClassStatic()->registerNatives({
+                    makeNativeMethod("initHybrid", AudioContext::initHybrid),
+                });
+            }
+
+            static HybridBase* initHybrid(alias_ref<jhybridobject> jThis) {
+                return new AudioContext(jThis);
+            }
+
+    private:
+            global_ref<jobject> javaObject_;
+    };
+}

android/src/main/cpp/AudioContext.h

@@ -0,0 +1,17 @@
+package com.audiocontext
+
+import com.audiocontext.jsi.AudioContextModule
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+class AudioContextPackage : ReactPackage {
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf<NativeModule>(AudioContextModule(reactContext))
+  }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return emptyList()
+  }
+}