diff --git a/.github/workflows/react-native-codestyle.yml b/.github/workflows/react-native-codestyle.yml index 8c2bd766a..101dcaac3 100644 --- a/.github/workflows/react-native-codestyle.yml +++ b/.github/workflows/react-native-codestyle.yml @@ -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 diff --git a/.github/workflows/react-native-demos.yml b/.github/workflows/react-native-demos.yml index 68723bcc6..811f66d06 100644 --- a/.github/workflows/react-native-demos.yml +++ b/.github/workflows/react-native-demos.yml @@ -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 diff --git a/.github/workflows/react-native.yml b/.github/workflows/react-native.yml index dc467b6d8..30c8aeb66 100644 --- a/.github/workflows/react-native.yml +++ b/.github/workflows/react-native.yml @@ -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 diff --git a/binding/react-native/README.md b/binding/react-native/README.md index 3627da9bd..4b414e266 100644 --- a/binding/react-native/README.md +++ b/binding/react-native/README.md @@ -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 diff --git a/binding/react-native/android/build.gradle b/binding/react-native/android/build.gradle index b27081f04..8d07016db 100644 --- a/binding/react-native/android/build.gradle +++ b/binding/react-native/android/build.gradle @@ -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' } diff --git a/binding/react-native/ios/Rhino.xcodeproj/project.pbxproj b/binding/react-native/ios/Rhino.xcodeproj/project.pbxproj index b003a7f42..ad4aedfeb 100644 --- a/binding/react-native/ios/Rhino.xcodeproj/project.pbxproj +++ b/binding/react-native/ios/Rhino.xcodeproj/project.pbxproj @@ -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}"; diff --git a/binding/react-native/package.json b/binding/react-native/package.json index 27d1b8d20..84c37197d 100644 --- a/binding/react-native/package.json +++ b/binding/react-native/package.json @@ -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", diff --git a/binding/react-native/rhino-react-native.podspec b/binding/react-native/rhino-react-native.podspec index 758ab38f3..83d0af77e 100644 --- a/binding/react-native/rhino-react-native.podspec +++ b/binding/react-native/rhino-react-native.podspec @@ -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 diff --git a/binding/react-native/test-app/RhinoTestApp/ios/Podfile b/binding/react-native/test-app/RhinoTestApp/ios/Podfile index 318e0e78d..d200f6325 100644 --- a/binding/react-native/test-app/RhinoTestApp/ios/Podfile +++ b/binding/react-native/test-app/RhinoTestApp/ios/Podfile @@ -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 diff --git a/binding/react-native/test-app/RhinoTestApp/ios/Podfile.lock b/binding/react-native/test-app/RhinoTestApp/ios/Podfile.lock index 3e1259642..8d8b07dd7 100644 --- a/binding/react-native/test-app/RhinoTestApp/ios/Podfile.lock +++ b/binding/react-native/test-app/RhinoTestApp/ios/Podfile.lock @@ -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 diff --git a/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj b/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj index 57302fd59..da95fa241 100644 --- a/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj +++ b/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj @@ -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)", diff --git a/demo/react-native/ios/Podfile b/demo/react-native/ios/Podfile index 29bc4eafb..c6bd95f34 100644 --- a/demo/react-native/ios/Podfile +++ b/demo/react-native/ios/Podfile @@ -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! diff --git a/demo/react-native/ios/Podfile.lock b/demo/react-native/ios/Podfile.lock index abf31f79b..1f0803601 100644 --- a/demo/react-native/ios/Podfile.lock +++ b/demo/react-native/ios/Podfile.lock @@ -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 diff --git a/demo/react-native/ios/RhinoDemo.xcodeproj/project.pbxproj b/demo/react-native/ios/RhinoDemo.xcodeproj/project.pbxproj index 290cf4274..6fd3befab 100644 --- a/demo/react-native/ios/RhinoDemo.xcodeproj/project.pbxproj +++ b/demo/react-native/ios/RhinoDemo.xcodeproj/project.pbxproj @@ -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)\"", diff --git a/demo/react-native/package.json b/demo/react-native/package.json index b8102ad84..5c38a7030 100644 --- a/demo/react-native/package.json +++ b/demo/react-native/package.json @@ -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" }, diff --git a/demo/react-native/yarn.lock b/demo/react-native/yarn.lock index 6afc11a97..4ef80407e 100644 --- a/demo/react-native/yarn.lock +++ b/demo/react-native/yarn.lock @@ -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/rhino-react-native@3.0.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/rhino-react-native@3.0.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"