Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update react native #653

Merged
merged 3 commits into from
Nov 17, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/react-native-codestyle.yml
Original file line number Diff line number Diff line change
@@ -31,9 +31,6 @@ jobs:
with:
node-version: lts/*

- name: Pre-build dependencies
run: npm install yarn

- name: Run Binding Linter
run: yarn && yarn lint
working-directory: binding/react-native
18 changes: 0 additions & 18 deletions .github/workflows/react-native-demos.yml
Original file line number Diff line number Diff line change
@@ -35,15 +35,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

# ************ REMOVE AFTER RELEASE *****************
- name: Build and package binding
working-directory: binding/react-native
run: yarn && yarn pkg

- name: Add to demo
run: yarn add ../../binding/react-native/pkg/picovoice-rhino-react-native-3.0.0.tgz
# ***************************************************

- name: Install dependencies
run: yarn android-install

@@ -69,15 +60,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

# ************ REMOVE AFTER RELEASE *****************
- name: Build and package binding
working-directory: binding/react-native
run: yarn && yarn pkg

- name: Add to demo
run: yarn add ../../binding/react-native/pkg/picovoice-rhino-react-native-3.0.0.tgz
# ***************************************************

- name: Install dependencies
run: yarn ios-install

5 changes: 1 addition & 4 deletions .github/workflows/react-native.yml
Original file line number Diff line number Diff line change
@@ -49,11 +49,8 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Pre-build dependencies
run: npm install yarn

- name: Install dependencies
run: yarn install

- name: Build
run: yarn
run: yarn prepare
2 changes: 1 addition & 1 deletion binding/react-native/README.md
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ Rhino is:
This binding is for running Rhino on **React Native 0.62.2+** on the following platforms:

- Android 5.0+ (API 21+)
- iOS 11.0+
- iOS 13.0+

## Installation

2 changes: 1 addition & 1 deletion binding/react-native/android/build.gradle
Original file line number Diff line number Diff line change
@@ -120,5 +120,5 @@ repositories {
dependencies {
// noinspection GradleDynamicVersion
api 'com.facebook.react:react-native:+'
implementation 'ai.picovoice:rhino-android:3.0.0'
implementation 'ai.picovoice:rhino-android:3.0.1'
}
4 changes: 2 additions & 2 deletions binding/react-native/ios/Rhino.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -251,7 +251,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_INCLUDE_PATHS = "${SRCROOT}";
2 changes: 1 addition & 1 deletion binding/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@picovoice/rhino-react-native",
"version": "3.0.0",
"version": "3.0.1",
"description": "Picovoice Rhino React Native binding",
"main": "lib/commonjs/index",
"module": "lib/module/index",
4 changes: 2 additions & 2 deletions binding/react-native/rhino-react-native.podspec
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ Pod::Spec.new do |s|
s.license = package["license"]
s.authors = package["author"]

s.platforms = { :ios => "11.0" }
s.platforms = { :ios => "13.0" }
s.source = { :git => "https://github.com/Picovoice/rhino.git", :tag => "#{s.version}" }

s.source_files = "ios/*.{h,m,mm,swift}"

s.dependency "React"
s.dependency 'Rhino-iOS', '~> 3.0.0'
s.dependency 'Rhino-iOS', '~> 3.0.1'
end
2 changes: 1 addition & 1 deletion binding/react-native/test-app/RhinoTestApp/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, min_ios_version_supported
platform :ios, '13.0'
prepare_react_native_project!

flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
12 changes: 6 additions & 6 deletions binding/react-native/test-app/RhinoTestApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -382,11 +382,11 @@ PODS:
- React-jsi (= 0.71.0)
- React-logger (= 0.71.0)
- React-perflogger (= 0.71.0)
- Rhino-iOS (3.0.0):
- Rhino-iOS (3.0.1):
- ios-voice-processor (~> 1.1.0)
- rhino-react-native (3.0.0):
- rhino-react-native (3.0.1):
- React
- Rhino-iOS (~> 3.0.0)
- Rhino-iOS (~> 3.0.1)
- RNFS (2.20.0):
- React-Core
- SocketRocket (0.6.1)
@@ -603,13 +603,13 @@ SPEC CHECKSUMS:
React-RCTVibration: 55c91eccdbd435d7634efbe847086944389475b0
React-runtimeexecutor: ac80782d9d76ba2b0f709f4de0c427fe33c352dc
ReactCommon: 20e38a9be5fe1341b5e422220877cc94034776ba
Rhino-iOS: b92978104bfad32da25b9eeaa4f0628b86ffcee9
rhino-react-native: 3954bad7e47e21256a0874999cbb0d2acf599186
Rhino-iOS: 4eeb02b38696907b28dd6f5dfa3a8f25355554ca
rhino-react-native: 8ef93ffeb956ad0c4843dfe0391df92cb9d290a6
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: c618b544ff8bd8865cdca602f00cbcdb92fd6d31
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: c3e6af2e1218c8d216a4030cfcc1eeb4829f5ec1
PODFILE CHECKSUM: fd292264395c1ecc5985652250a6c1f27a764296

COCOAPODS: 1.11.3
Original file line number Diff line number Diff line change
@@ -442,7 +442,7 @@
"$(inherited)",
);
INFOPLIST_FILE = RhinoTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -466,7 +466,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = RhinoTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -584,7 +584,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
@@ -649,7 +649,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
2 changes: 1 addition & 1 deletion demo/react-native/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, '11.0'
platform :ios, '13.0'

target 'RhinoDemo' do
config = use_native_modules!
12 changes: 6 additions & 6 deletions demo/react-native/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -287,11 +287,11 @@ PODS:
- React-jsi (= 0.68.7)
- React-logger (= 0.68.7)
- React-perflogger (= 0.68.7)
- Rhino-iOS (3.0.0):
- Rhino-iOS (3.0.1):
- ios-voice-processor (~> 1.1.0)
- rhino-react-native (3.0.0):
- rhino-react-native (3.0.1):
- React
- Rhino-iOS (~> 3.0.0)
- Rhino-iOS (~> 3.0.1)
- Yoga (1.14.0)

DEPENDENCIES:
@@ -439,10 +439,10 @@ SPEC CHECKSUMS:
React-RCTVibration: 2a4bf853281d4981ab471509102300d3c9e6c693
React-runtimeexecutor: 18932e685b4893be88d1efc18f5f8ca1c9cd39d8
ReactCommon: 29bb6fad3242e30e9d049bc9d592736fa3da9e50
Rhino-iOS: b92978104bfad32da25b9eeaa4f0628b86ffcee9
rhino-react-native: 3954bad7e47e21256a0874999cbb0d2acf599186
Rhino-iOS: 4eeb02b38696907b28dd6f5dfa3a8f25355554ca
rhino-react-native: 8ef93ffeb956ad0c4843dfe0391df92cb9d290a6
Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93

PODFILE CHECKSUM: 1bbfabf6f1c66bdf4ed7e43ff0bea37f3ae08498
PODFILE CHECKSUM: 4a3e20843482474120910ccf2e84e1141d29ec02

COCOAPODS: 1.11.3
8 changes: 4 additions & 4 deletions demo/react-native/ios/RhinoDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@
DEVELOPMENT_TEAM = 65723695GD;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = RhinoDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
@@ -327,7 +327,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 65723695GD;
INFOPLIST_FILE = RhinoDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
@@ -390,7 +390,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = (
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -444,7 +444,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = (
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
4 changes: 2 additions & 2 deletions demo/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rhino-react-native-demo",
"version": "3.0.0",
"version": "3.0.1",
"private": true,
"scripts": {
"start": "react-native start",
@@ -16,7 +16,7 @@
},
"dependencies": {
"@picovoice/react-native-voice-processor": "1.2.0",
"@picovoice/rhino-react-native": "3.0.0",
"@picovoice/rhino-react-native": "3.0.1",
"react": "^17.0.2",
"react-native": "^0.68.7"
},
8 changes: 4 additions & 4 deletions demo/react-native/yarn.lock
Original file line number Diff line number Diff line change
@@ -870,10 +870,10 @@
resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.0.tgz#82a98b41d9236ababe330dae873062ee0e1b24c3"
integrity sha512-zolTEo3qsqeUwY7JRslV/yhiA+oBrkeogOTxjHIEJ//yEsr7YKlI1PcqTbU5/xjmUiukh62gmwTXhosnQYdasQ==

"@picovoice/[email protected].0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@picovoice/rhino-react-native/-/rhino-react-native-3.0.0.tgz#0f73d3f493cc4e3e73138bfd946c9cacb9859339"
integrity sha512-2oSsn8/8hLo4ke2vHg9gF7e4CNDKorgdbh+gVudfiq7eiiZhgt7KL+vj0/a4V5N2maozAHMPvrog6ecAOddgiw==
"@picovoice/[email protected].1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@picovoice/rhino-react-native/-/rhino-react-native-3.0.1.tgz#7945213afa752ec3ddba79c7b1afb6125d22141f"
integrity sha512-6uKDRbub3deEJLoV5v7m2q3Lm95aDn62XlTCGf38ItAAs+zTx9QjRUxB6OUSJQ0tj6NUhMHjveQa0dg/d1s9qA==

"@react-native-community/cli-debugger-ui@^7.0.3":
version "7.0.3"