From 4c137f4e6884c7dd378bf14aa8b652f46bad177b Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Thu, 23 Nov 2023 15:54:57 -0800 Subject: [PATCH] v2.0 rn (#266) --- .github/workflows/react-native-demos.yml | 18 + .github/workflows/react-native-tests.yml | 2 +- .github/workflows/react-native.yml | 4 +- binding/react-native/android/build.gradle | 5 +- .../reactnative/cheetah/CheetahModule.java | 4 +- .../react-native/cheetah-react-native.podspec | 4 +- binding/react-native/ios/Cheetah.swift | 7 +- binding/react-native/package.json | 2 +- .../test-app/CheetahTestApp/.ruby-version | 1 - .../test-app/CheetahTestApp/Gemfile | 6 - .../CheetahTestApp/android/build.gradle | 6 + .../CheetahTestApp.xcodeproj/project.pbxproj | 8 +- .../test-app/CheetahTestApp/ios/Podfile | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- demo/react-native/App.tsx | 2 +- demo/react-native/android/build.gradle | 6 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ios/CheetahDemo.xcodeproj/project.pbxproj | 8 +- demo/react-native/ios/Podfile | 3 +- demo/react-native/ios/Podfile.lock | 459 ------------------ demo/react-native/package.json | 3 +- demo/react-native/yarn.lock | 5 - 22 files changed, 65 insertions(+), 495 deletions(-) delete mode 100644 binding/react-native/test-app/CheetahTestApp/.ruby-version delete mode 100644 binding/react-native/test-app/CheetahTestApp/Gemfile delete mode 100644 demo/react-native/ios/Podfile.lock diff --git a/.github/workflows/react-native-demos.yml b/.github/workflows/react-native-demos.yml index b2ca3fe8..c91b5a68 100644 --- a/.github/workflows/react-native-demos.yml +++ b/.github/workflows/react-native-demos.yml @@ -38,6 +38,15 @@ jobs: - name: Pre-build dependencies run: npm install yarn + # ************ 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-cheetah-react-native-2.0.0.tgz + # *************************************************** + - name: Install dependencies run: yarn android-install @@ -66,6 +75,15 @@ jobs: - name: Pre-build dependencies run: npm install yarn + # ************ 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-cheetah-react-native-2.0.0.tgz + # *************************************************** + - name: Install dependencies run: yarn ios-install diff --git a/.github/workflows/react-native-tests.yml b/.github/workflows/react-native-tests.yml index b60f2f01..65e2612d 100644 --- a/.github/workflows/react-native-tests.yml +++ b/.github/workflows/react-native-tests.yml @@ -59,7 +59,7 @@ jobs: ./copy_test_resources.sh - name: Cocoapods install working-directory: binding/react-native/test-app/CheetahTestApp/ios - run: pod install + run: pod install --repo-update - name: Inject AppID run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:' Tests.ts diff --git a/.github/workflows/react-native.yml b/.github/workflows/react-native.yml index 20603461..71d4b59d 100644 --- a/.github/workflows/react-native.yml +++ b/.github/workflows/react-native.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 18.x, 20.x] + node-version: [16.x, 18.x, 20.x] steps: - uses: actions/checkout@v3 @@ -44,4 +44,4 @@ jobs: run: yarn install - name: Build - run: yarn + run: yarn prepare diff --git a/binding/react-native/android/build.gradle b/binding/react-native/android/build.gradle index e2aab840..5f2a54e2 100644 --- a/binding/react-native/android/build.gradle +++ b/binding/react-native/android/build.gradle @@ -48,6 +48,9 @@ android { repositories { mavenCentral() google() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1302' + } def found = false def defaultDir = null @@ -118,5 +121,5 @@ repositories { dependencies { // noinspection GradleDynamicVersion api 'com.facebook.react:react-native:+' - implementation 'ai.picovoice:cheetah-android:1.1.2' + implementation 'ai.picovoice:cheetah-android:2.0.0' } diff --git a/binding/react-native/android/src/main/java/ai/picovoice/reactnative/cheetah/CheetahModule.java b/binding/react-native/android/src/main/java/ai/picovoice/reactnative/cheetah/CheetahModule.java index a1ab9c1e..a743635c 100644 --- a/binding/react-native/android/src/main/java/ai/picovoice/reactnative/cheetah/CheetahModule.java +++ b/binding/react-native/android/src/main/java/ai/picovoice/reactnative/cheetah/CheetahModule.java @@ -35,13 +35,15 @@ * CheetahModule Class. */ public class CheetahModule extends ReactContextBaseJavaModule { - + private final ReactApplicationContext reactContext; private final Map cheetahPool = new HashMap<>(); public CheetahModule(ReactApplicationContext reactContext) { super(reactContext); this.reactContext = reactContext; + + Cheetah.setSdk("react-native"); } @NonNull diff --git a/binding/react-native/cheetah-react-native.podspec b/binding/react-native/cheetah-react-native.podspec index 5216caab..352cc987 100644 --- a/binding/react-native/cheetah-react-native.podspec +++ b/binding/react-native/cheetah-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/cheetah.git", :tag => "#{s.version}" } s.source_files = "ios/*.{h,m,mm,swift}" s.dependency "React" - s.dependency "Cheetah-iOS", '~> 1.1.0' + s.dependency "Cheetah-iOS", '~> 2.0.0' end diff --git a/binding/react-native/ios/Cheetah.swift b/binding/react-native/ios/Cheetah.swift index 72cb24ef..5e61cacf 100644 --- a/binding/react-native/ios/Cheetah.swift +++ b/binding/react-native/ios/Cheetah.swift @@ -1,5 +1,5 @@ // -// Copyright 2022 Picovoice Inc. +// Copyright 2022-2023 Picovoice Inc. // // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" // file accompanying this source. @@ -15,6 +15,11 @@ import Cheetah class PvCheetah: NSObject { private var cheetahPool: [String: Cheetah] = [:] + override init() { + super.init() + Cheetah.setSdk(sdk: "react-native") + } + @objc(create:modelPath:endpointDuration:enableAutomaticPunctuation:resolver:rejecter:) func create( accessKey: String, diff --git a/binding/react-native/package.json b/binding/react-native/package.json index 299d6f06..0b5603f8 100644 --- a/binding/react-native/package.json +++ b/binding/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/cheetah-react-native", - "version": "1.1.1", + "version": "2.0.0", "description": "Picovoice Cheetah React Native binding", "main": "lib/commonjs/index", "module": "lib/module/index", diff --git a/binding/react-native/test-app/CheetahTestApp/.ruby-version b/binding/react-native/test-app/CheetahTestApp/.ruby-version deleted file mode 100644 index 49cdd668..00000000 --- a/binding/react-native/test-app/CheetahTestApp/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.6 diff --git a/binding/react-native/test-app/CheetahTestApp/Gemfile b/binding/react-native/test-app/CheetahTestApp/Gemfile deleted file mode 100644 index 567e5980..00000000 --- a/binding/react-native/test-app/CheetahTestApp/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby File.read(File.join(__dir__, '.ruby-version')).strip - -gem 'cocoapods', '~> 1.11', '>= 1.11.3' diff --git a/binding/react-native/test-app/CheetahTestApp/android/build.gradle b/binding/react-native/test-app/CheetahTestApp/android/build.gradle index d5fe30c6..ce9422f8 100644 --- a/binding/react-native/test-app/CheetahTestApp/android/build.gradle +++ b/binding/react-native/test-app/CheetahTestApp/android/build.gradle @@ -14,6 +14,9 @@ buildscript { repositories { google() mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1302' + } } dependencies { classpath("com.android.tools.build:gradle:7.3.1") @@ -36,6 +39,9 @@ allprojects { allprojects { repositories { + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1302' + } maven { url("$rootDir/../node_modules/detox/Detox-android") } diff --git a/binding/react-native/test-app/CheetahTestApp/ios/CheetahTestApp.xcodeproj/project.pbxproj b/binding/react-native/test-app/CheetahTestApp/ios/CheetahTestApp.xcodeproj/project.pbxproj index ca943e48..e348c785 100644 --- a/binding/react-native/test-app/CheetahTestApp/ios/CheetahTestApp.xcodeproj/project.pbxproj +++ b/binding/react-native/test-app/CheetahTestApp/ios/CheetahTestApp.xcodeproj/project.pbxproj @@ -442,7 +442,7 @@ "$(inherited)", ); INFOPLIST_FILE = CheetahTestAppTests/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 = CheetahTestAppTests/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/binding/react-native/test-app/CheetahTestApp/ios/Podfile b/binding/react-native/test-app/CheetahTestApp/ios/Podfile index 5d6d4863..4e86a9ca 100644 --- a/binding/react-native/test-app/CheetahTestApp/ios/Podfile +++ b/binding/react-native/test-app/CheetahTestApp/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 @@ -14,6 +14,7 @@ end target 'CheetahTestApp' do config = use_native_modules! + pod 'Cheetah-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/cheetah/v2.0-ios/binding/ios/Cheetah-iOS.podspec' # Flags change depending on the env values. flags = get_default_flags() diff --git a/demo/android/CheetahDemo/gradle/wrapper/gradle-wrapper.properties b/demo/android/CheetahDemo/gradle/wrapper/gradle-wrapper.properties index 740ab489..703a15c5 100644 --- a/demo/android/CheetahDemo/gradle/wrapper/gradle-wrapper.properties +++ b/demo/android/CheetahDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jun 29 23:02:09 PDT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/demo/react-native/App.tsx b/demo/react-native/App.tsx index f93c0a84..b9408e94 100644 --- a/demo/react-native/App.tsx +++ b/demo/react-native/App.tsx @@ -125,7 +125,7 @@ export default class App extends Component { handleError(err: any) { let errorMessage: string; if (err instanceof CheetahErrors.CheetahInvalidArgumentError) { - errorMessage = `${err.message}\nPlease make sure accessKey ${this._accessKey} is a valid access key.`; + errorMessage = `${err.message}`; } else if (err instanceof CheetahErrors.CheetahActivationError) { errorMessage = 'AccessKey activation error'; } else if (err instanceof CheetahErrors.CheetahActivationLimitError) { diff --git a/demo/react-native/android/build.gradle b/demo/react-native/android/build.gradle index c1d8954a..76c2e6ad 100644 --- a/demo/react-native/android/build.gradle +++ b/demo/react-native/android/build.gradle @@ -10,6 +10,9 @@ buildscript { repositories { google() jcenter() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1302' + } } dependencies { classpath("com.android.tools.build:gradle:4.1.3") @@ -32,6 +35,9 @@ allprojects { google() jcenter() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1302' + } maven { url 'https://www.jitpack.io' } } } diff --git a/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties b/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties index 991f0739..d42b2de8 100644 --- a/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Nov 02 11:32:43 PDT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/demo/react-native/ios/CheetahDemo.xcodeproj/project.pbxproj b/demo/react-native/ios/CheetahDemo.xcodeproj/project.pbxproj index 7955d3bc..d3808ef8 100644 --- a/demo/react-native/ios/CheetahDemo.xcodeproj/project.pbxproj +++ b/demo/react-native/ios/CheetahDemo.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ DEVELOPMENT_TEAM = 65723695GD; ENABLE_BITCODE = NO; INFOPLIST_FILE = CheetahDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", @@ -320,7 +320,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 65723695GD; INFOPLIST_FILE = CheetahDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", @@ -382,7 +382,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", @@ -434,7 +434,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.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/ios/Podfile b/demo/react-native/ios/Podfile index e5a81214..cb0f5d03 100644 --- a/demo/react-native/ios/Podfile +++ b/demo/react-native/ios/Podfile @@ -1,9 +1,10 @@ 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 'CheetahDemo' do config = use_native_modules! + pod 'Cheetah-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/cheetah/v2.0-ios/binding/ios/Cheetah-iOS.podspec' use_react_native!(:path => config["reactNativePath"]) end diff --git a/demo/react-native/ios/Podfile.lock b/demo/react-native/ios/Podfile.lock deleted file mode 100644 index 8b16da5d..00000000 --- a/demo/react-native/ios/Podfile.lock +++ /dev/null @@ -1,459 +0,0 @@ -PODS: - - boost (1.76.0) - - Cheetah-iOS (1.1.0) - - cheetah-react-native (1.1.1): - - Cheetah-iOS (~> 1.1.0) - - React - - DoubleConversion (1.1.6) - - FBLazyVector (0.68.7) - - FBReactNativeSpec (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.7) - - RCTTypeSafety (= 0.68.7) - - React-Core (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - fmt (6.2.1) - - glog (0.3.5) - - ios-voice-processor (1.1.0) - - RCT-Folly (2021.06.28.00-v2): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - RCT-Folly/Default (= 2021.06.28.00-v2) - - RCT-Folly/Default (2021.06.28.00-v2): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - RCTRequired (0.68.7) - - RCTTypeSafety (0.68.7): - - FBLazyVector (= 0.68.7) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.7) - - React-Core (= 0.68.7) - - React (0.68.7): - - React-Core (= 0.68.7) - - React-Core/DevSupport (= 0.68.7) - - React-Core/RCTWebSocket (= 0.68.7) - - React-RCTActionSheet (= 0.68.7) - - React-RCTAnimation (= 0.68.7) - - React-RCTBlob (= 0.68.7) - - React-RCTImage (= 0.68.7) - - React-RCTLinking (= 0.68.7) - - React-RCTNetwork (= 0.68.7) - - React-RCTSettings (= 0.68.7) - - React-RCTText (= 0.68.7) - - React-RCTVibration (= 0.68.7) - - React-callinvoker (0.68.7) - - React-Codegen (0.68.7): - - FBReactNativeSpec (= 0.68.7) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.7) - - RCTTypeSafety (= 0.68.7) - - React-Core (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-Core (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.7) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/CoreModulesHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/Default (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/DevSupport (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.7) - - React-Core/RCTWebSocket (= 0.68.7) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-jsinspector (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTActionSheetHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTAnimationHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTBlobHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTImageHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTLinkingHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTNetworkHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTSettingsHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTTextHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTVibrationHeaders (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-Core/RCTWebSocket (0.68.7): - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.7) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsiexecutor (= 0.68.7) - - React-perflogger (= 0.68.7) - - Yoga - - React-CoreModules (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.7) - - React-Codegen (= 0.68.7) - - React-Core/CoreModulesHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - React-RCTImage (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-cxxreact (0.68.7): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.7) - - React-jsi (= 0.68.7) - - React-jsinspector (= 0.68.7) - - React-logger (= 0.68.7) - - React-perflogger (= 0.68.7) - - React-runtimeexecutor (= 0.68.7) - - React-jsi (0.68.7): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.68.7) - - React-jsi/Default (0.68.7): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.68.7): - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-perflogger (= 0.68.7) - - React-jsinspector (0.68.7) - - React-logger (0.68.7): - - glog - - react-native-voice-processor (1.2.0): - - ios-voice-processor (~> 1.1.0) - - React-Core - - React-perflogger (0.68.7) - - React-RCTActionSheet (0.68.7): - - React-Core/RCTActionSheetHeaders (= 0.68.7) - - React-RCTAnimation (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.7) - - React-Codegen (= 0.68.7) - - React-Core/RCTAnimationHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTBlob (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.7) - - React-Core/RCTBlobHeaders (= 0.68.7) - - React-Core/RCTWebSocket (= 0.68.7) - - React-jsi (= 0.68.7) - - React-RCTNetwork (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTImage (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.7) - - React-Codegen (= 0.68.7) - - React-Core/RCTImageHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - React-RCTNetwork (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTLinking (0.68.7): - - React-Codegen (= 0.68.7) - - React-Core/RCTLinkingHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTNetwork (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.7) - - React-Codegen (= 0.68.7) - - React-Core/RCTNetworkHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTSettings (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.7) - - React-Codegen (= 0.68.7) - - React-Core/RCTSettingsHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-RCTText (0.68.7): - - React-Core/RCTTextHeaders (= 0.68.7) - - React-RCTVibration (0.68.7): - - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.7) - - React-Core/RCTVibrationHeaders (= 0.68.7) - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (= 0.68.7) - - React-runtimeexecutor (0.68.7): - - React-jsi (= 0.68.7) - - ReactCommon/turbomodule/core (0.68.7): - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.7) - - React-Core (= 0.68.7) - - React-cxxreact (= 0.68.7) - - React-jsi (= 0.68.7) - - React-logger (= 0.68.7) - - React-perflogger (= 0.68.7) - - RNCPicker (1.16.8): - - React-Core - - RNFS (2.20.0): - - React-Core - - Yoga (1.14.0) - -DEPENDENCIES: - - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - "cheetah-react-native (from `../node_modules/@picovoice/cheetah-react-native`)" - - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - - React (from `../node_modules/react-native/`) - - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - - React-Codegen (from `build/generated/ios`) - - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - - "react-native-voice-processor (from `../node_modules/@picovoice/react-native-voice-processor`)" - - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - - RNFS (from `../node_modules/react-native-fs`) - - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) - -SPEC REPOS: - trunk: - - Cheetah-iOS - - fmt - - ios-voice-processor - -EXTERNAL SOURCES: - boost: - :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" - cheetah-react-native: - :path: "../node_modules/@picovoice/cheetah-react-native" - DoubleConversion: - :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" - FBLazyVector: - :path: "../node_modules/react-native/Libraries/FBLazyVector" - FBReactNativeSpec: - :path: "../node_modules/react-native/React/FBReactNativeSpec" - glog: - :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" - RCT-Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" - RCTRequired: - :path: "../node_modules/react-native/Libraries/RCTRequired" - RCTTypeSafety: - :path: "../node_modules/react-native/Libraries/TypeSafety" - React: - :path: "../node_modules/react-native/" - React-callinvoker: - :path: "../node_modules/react-native/ReactCommon/callinvoker" - React-Codegen: - :path: build/generated/ios - React-Core: - :path: "../node_modules/react-native/" - React-CoreModules: - :path: "../node_modules/react-native/React/CoreModules" - React-cxxreact: - :path: "../node_modules/react-native/ReactCommon/cxxreact" - React-jsi: - :path: "../node_modules/react-native/ReactCommon/jsi" - React-jsiexecutor: - :path: "../node_modules/react-native/ReactCommon/jsiexecutor" - React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector" - React-logger: - :path: "../node_modules/react-native/ReactCommon/logger" - react-native-voice-processor: - :path: "../node_modules/@picovoice/react-native-voice-processor" - React-perflogger: - :path: "../node_modules/react-native/ReactCommon/reactperflogger" - React-RCTActionSheet: - :path: "../node_modules/react-native/Libraries/ActionSheetIOS" - React-RCTAnimation: - :path: "../node_modules/react-native/Libraries/NativeAnimation" - React-RCTBlob: - :path: "../node_modules/react-native/Libraries/Blob" - React-RCTImage: - :path: "../node_modules/react-native/Libraries/Image" - React-RCTLinking: - :path: "../node_modules/react-native/Libraries/LinkingIOS" - React-RCTNetwork: - :path: "../node_modules/react-native/Libraries/Network" - React-RCTSettings: - :path: "../node_modules/react-native/Libraries/Settings" - React-RCTText: - :path: "../node_modules/react-native/Libraries/Text" - React-RCTVibration: - :path: "../node_modules/react-native/Libraries/Vibration" - React-runtimeexecutor: - :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" - ReactCommon: - :path: "../node_modules/react-native/ReactCommon" - RNCPicker: - :path: "../node_modules/@react-native-picker/picker" - RNFS: - :path: "../node_modules/react-native-fs" - Yoga: - :path: "../node_modules/react-native/ReactCommon/yoga" - -SPEC CHECKSUMS: - boost: a7c83b31436843459a1961bfd74b96033dc77234 - Cheetah-iOS: 6fb7be693878f5b1dec0ea5b6534fbba30954afc - cheetah-react-native: a7b750ffeff3fbcab49335a5f0d84f06cbce4815 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: 63b89dc85804d5817261f56dc4cfb43a9b6d57f5 - FBReactNativeSpec: 1fa200a9862d9369a53b6fddbbfcdc22bab24062 - fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 476ee3e89abb49e07f822b48323c51c57124b572 - ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 - RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: 530916cd48c5f7cf1fc16966ad5ea01638ca4799 - RCTTypeSafety: 5fb4cb3080efd582e5563c3e9a0e459fc51396c5 - React: 097b19fbc7aecb3bd23de54b462d2051d7ca8a38 - React-callinvoker: 4f118545cf884f0d8fce5bcd6e1847147ea9cc05 - React-Codegen: 24e59be16f8ed24b3e49e5ff0738dad91988c760 - React-Core: 0b464d0bec18dde90fa819c4be14dbcbdbf3077f - React-CoreModules: 9bb7d5d5530d474cf8514e2dc8274af82a0bcf2f - React-cxxreact: 027e192b8008ba5c200163ab6ded55d134c839d5 - React-jsi: 9019a0a0b42e9eac6c1e8c251a8dffe65055a2f1 - React-jsiexecutor: 7c0bd030a84f2ec446fb104b7735af2f5ed11eea - React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e - React-logger: b75b80500ea80457b2cf169427d66de986cdcb29 - react-native-voice-processor: aefb0845641c7d67dd47e69606ba7ebb38aab5cd - React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d - React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09 - React-RCTAnimation: f05da175751867521d14b02ab4d3994a7b96f131 - React-RCTBlob: 792b966e48d599383d7a0753f75e8f2ff71be1ce - React-RCTImage: 065cf66546f625295efd36bce3a1806a9b93399c - React-RCTLinking: 8246290c072bd2d1f336792038d7ec4b91f9847a - React-RCTNetwork: 6b2331c74684fae61b1ef38f4510fe5da3de3f3a - React-RCTSettings: 2898e15b249b085f8b8c7401cfab71983a2d40da - React-RCTText: bd1da1cd805e0765e3ba9089a9fd807d4860a901 - React-RCTVibration: 2a4bf853281d4981ab471509102300d3c9e6c693 - React-runtimeexecutor: 18932e685b4893be88d1efc18f5f8ca1c9cd39d8 - ReactCommon: 29bb6fad3242e30e9d049bc9d592736fa3da9e50 - RNCPicker: 0991c56da7815c0cf946d6f63cf920b25296e5f6 - RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 - Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93 - -PODFILE CHECKSUM: eecdda7e5ef8e4b3162634729aaad4fa0babb35b - -COCOAPODS: 1.12.1 diff --git a/demo/react-native/package.json b/demo/react-native/package.json index 632c4733..2621a57e 100644 --- a/demo/react-native/package.json +++ b/demo/react-native/package.json @@ -1,6 +1,6 @@ { "name": "cheetah-react-native-demo", - "version": "1.0.0", + "version": "2.0.0", "private": true, "scripts": { "start": "react-native start", @@ -16,7 +16,6 @@ "postinstall": "node copy.js" }, "dependencies": { - "@picovoice/cheetah-react-native": "^1.1.1", "@picovoice/react-native-voice-processor": "^1.2.0", "@react-native-picker/picker": "^1.9.2", "react": "^17.0.2", diff --git a/demo/react-native/yarn.lock b/demo/react-native/yarn.lock index a7623431..32e87a7f 100644 --- a/demo/react-native/yarn.lock +++ b/demo/react-native/yarn.lock @@ -1090,11 +1090,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@picovoice/cheetah-react-native@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@picovoice/cheetah-react-native/-/cheetah-react-native-1.1.1.tgz#1cc7957fea53c63e0c7c7de87373d197c3471080" - integrity sha512-cB8rsZKJY1F61gcPaaYJIEZ9hHTRWYgiKyK1Laa9e4d212O5Rnu2ggLVp//dOs8EY7YK6cQ1puJ8h+wTvqgx9Q== - "@picovoice/react-native-voice-processor@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.0.tgz#82a98b41d9236ababe330dae873062ee0e1b24c3"