v2.0 rn

.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
 

.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

.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

binding/ios/CheetahAppTest/CheetahAppTest/ViewController.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.
 //  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
@@ -9,10 +9,4 @@
 
 import UIKit
 
-class ViewController: UIViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-    }
-
-}
+class ViewController: UIViewController { }

binding/ios/CheetahAppTest/CheetahAppTestUITests/CheetahAppTestUITests.swift

@@ -19,14 +19,6 @@ class CheetahDemoUITests: XCTestCase {
 
     let modelURL = Bundle(for: CheetahDemoUITests.self).url(forResource: "cheetah_params", withExtension: "pv")!
 
-    override func setUp() {
-        super.setUp()
-    }
-
-    override func tearDown() {
-        super.tearDown()
-    }
-
     override func setUpWithError() throws {
         continueAfterFailure = true
     }

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'
 }

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<String, Cheetah> cheetahPool = new HashMap<>();
 
     public CheetahModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
+
+        Cheetah.setSdk("react-native");
     }
 
     @NonNull

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

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,

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",

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")
         }

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)",

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()

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

demo/react-native/App.tsx

@@ -125,7 +125,7 @@
   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) {
@@ -217,7 +217,7 @@
         <View style={styles.statusBar}>
           <Text style={styles.statusBarText}>Cheetah</Text>
         </View>
         <View style={{flex: 6}}>
           <View style={styles.transcriptionBox}>
             <ScrollView
               ref={(el) => {
@@ -239,7 +239,7 @@
         {this.state.appState === UIState.error && (
           <View style={styles.errorBox}>
             <Text
               style={{
                 color: 'white',
                 fontSize: 16,
               }}>
@@ -249,7 +249,7 @@
         )}
 
         <View
           style={{flex: 1, justifyContent: 'center', alignContent: 'center'}}>
           <TouchableOpacity
             style={[styles.buttonStyle, disabled ? styles.buttonDisabled : {}]}
             onPress={() => this._toggleListening()}
@@ -260,7 +260,7 @@
           </TouchableOpacity>
         </View>
 
         <View style={{flex: 0.5, justifyContent: 'center', paddingBottom: 10}}>
           <Text style={styles.instructions}>
             Made in Vancouver, Canada by Picovoice
           </Text>

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' }
     }
 }

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

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)\"",

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