react-native-audio-api 0.4.12-beta.2 → 0.4.12-beta.4

package/RNAudioAPI.podspec

@@ -1,13 +1,10 @@
 require "json"
-require_relative './scripts/audioapi_utils'
 
 package_json = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-$config = find_config()
-assert_minimal_react_native_version($config)
 $new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
-folly_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=#{$config[:react_native_minor_version]}"
+folly_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32"
 fabric_flags = $new_arch_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
 version_flag = "-DAUDIOAPI_VERSION=#{package_json['version']}"
 
@@ -30,38 +27,23 @@ Pod::Spec.new do |s|
     ss.subspec "ios" do |sss|
       sss.source_files = "ios/audioapi/**/*.{mm,h,m}"
       sss.header_dir = "audioapi"
-      sss.header_mappings_dir = "ios/ausioapi"
+      sss.header_mappings_dir = "ios/audioapi"
     end
   end
 
   s.ios.frameworks = 'CoreFoundation', 'CoreAudio', 'AudioToolbox', 'Accelerate'
 
-  s.pod_target_xcconfig    = {
+  s.compiler_flags = "#{folly_flags}"
+
+  s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
-    "DEFINES_MODULE" => "YES",
-    "HEADER_SEARCH_PATHS" => '"$(PODS_TARGET_SRCROOT)/ReactCommon" "$(PODS_TARGET_SRCROOT)" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/DoubleConversion" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
-    "FRAMEWORK_SEARCH_PATHS" => '"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes"',
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) HAVE_ACCELERATE=1',
-  }
-  s.compiler_flags = "#{folly_flags}"
-
-  s.xcconfig = {
-    "HEADER_SEARCH_PATHS" => [
-      '"$(PODS_ROOT)/boost"',
-      '"$(PODS_ROOT)/boost-for-react-native"',
-      '"$(PODS_ROOT)/glog"',
-      '"$(PODS_ROOT)/RCT-Folly"',
-      '"$(PODS_ROOT)/Headers/Public/React-hermes"',
-      '"$(PODS_ROOT)/Headers/Public/hermes-engine"',
-      "\"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
-      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/ios\"",
-      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/common/cpp\"",
-    ].join(' '),
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\" \"$(PODS_TARGET_SRCROOT)/ios\"",
     'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
   }
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  install_modules_dependencies(s, new_arch_enabled: true)
+  install_modules_dependencies(s)
 end

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -1,34 +1,41 @@
 #import "AudioAPIModule.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridge+Private.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTCallInvoker.h>
 #import <ReactCommon/RCTTurboModule.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
 #include <audioapi/AudioAPIModuleInstaller.h>
 
-@implementation AudioAPIModule
+using namespace audioapi;
+using namespace facebook::react;
 
-#if defined(RCT_NEW_ARCH_ENABLED)
+@interface RCTBridge (JSIRuntime)
+- (void *)runtime;
+@end
+
+#if defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
 // nothing
-#else // defined(RCT_NEW_ARCH_ENABLED)
+#else // defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
 @interface RCTBridge (RCTTurboModule)
 - (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
 - (void)_tryAndHandleError:(dispatch_block_t)block;
 @end
 #endif // RCT_NEW_ARCH_ENABLED
 
+@implementation AudioAPIModule
+
 #if defined(RCT_NEW_ARCH_ENABLED)
 @synthesize callInvoker = _callInvoker;
 #endif // defined(RCT_NEW_ARCH_ENABLED)
 
-RCT_EXPORT_MODULE(AudioAPIModule)
+RCT_EXPORT_MODULE(AudioAPIModule);
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
-  auto *cxxBridge = reinterpret_cast<RCTCxxBridge *>(self.bridge);
-  auto jsiRuntime = reinterpret_cast<facebook::jsi::Runtime *>(cxxBridge.runtime);
+  auto jsiRuntime = reinterpret_cast<facebook::jsi::Runtime *>(self.bridge.runtime);
 
 #if defined(RCT_NEW_ARCH_ENABLED)
   auto jsCallInvoker = _callInvoker.callInvoker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.4.12-beta.2",
+  "version": "0.4.12-beta.4",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/scripts/audioapi_utils.rb

@@ -1,56 +0,0 @@
-def try_to_parse_react_native_package_json(node_modules_dir)
-  react_native_package_json_path = File.join(node_modules_dir, 'react-native/package.json')
-  if !File.exist?(react_native_package_json_path)
-    return nil
-  end
-  return JSON.parse(File.read(react_native_package_json_path))
-end
-
-def find_config()
-  result = {
-    :react_native_version => nil,
-    :react_native_minor_version => nil,
-    :react_native_node_modules_dir => nil,
-    :react_native_common_dir => nil,
-    :react_native_audioapi_dir_from_pods_root => nil,
-  }
-
-  react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..')
-  react_native_json = try_to_parse_react_native_package_json(react_native_node_modules_dir)
-
-  if react_native_json == nil
-    # user configuration, just in case
-    node_modules_dir = ENV["REACT_NATIVE_NODE_MODULES_DIR"]
-    react_native_json = try_to_parse_react_native_package_json(node_modules_dir)
-  end
-
-  if react_native_json == nil
-    raise '[Audio API] Unable to recognize your `react-native` version. Please set environmental variable with `react-native` location: `export REACT_NATIVE_NODE_MODULES_DIR="<path to react-native>" && pod install`.'
-  end
-
-  result[:react_native_version] = react_native_json['version']
-  result[:react_native_minor_version] = react_native_json['version'].split('.')[1].to_i
-  if result[:react_native_minor_version] == 0 # nightly
-    result[:react_native_minor_version] = 1000
-  end
-  result[:react_native_node_modules_dir] = File.expand_path(react_native_node_modules_dir)
-
-  pods_root = Pod::Config.instance.project_pods_root
-  react_native_common_dir_absolute = File.join(react_native_node_modules_dir, 'react-native', 'ReactCommon')
-  react_native_common_dir_relative = Pathname.new(react_native_common_dir_absolute).relative_path_from(pods_root).to_s
-  result[:react_native_common_dir] = react_native_common_dir_relative
-
-  react_native_audioapi_dir_absolute = File.join(__dir__, '..')
-  react_native_audioapi_dir_relative = Pathname.new(react_native_audioapi_dir_absolute).relative_path_from(pods_root).to_s
-  result[:react_native_audioapi_dir_from_pods_root] = react_native_audioapi_dir_relative
-
-  return result
-end
-
-def assert_minimal_react_native_version(config)
-      # If you change the minimal React Native version remember to update Compatibility Table in docs
-  minimalReactNativeVersion = 75
-  if config[:react_native_minor_version] < minimalReactNativeVersion
-    raise "[Audio API] Unsupported React Native version. Please use #{minimalReactNativeVersion} or newer."
-  end
-end