diff --git a/.github/workflows/ios-demos.yml b/.github/workflows/ios-demos.yml index 1e3ade34a1..a2365f1dcb 100644 --- a/.github/workflows/ios-demos.yml +++ b/.github/workflows/ios-demos.yml @@ -24,27 +24,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up Node.js LTS - uses: actions/setup-node@v3 - with: - node-version: lts/* - - - name: Install Cocoapods - run: gem install cocoapods - - - name: Install AppCenter CLI - run: npm install -g appcenter-cli - - - name: Make build dir - run: mkdir ddp - - - name: Run Cocoapods - run: pod install - - name: Build English run: xcrun xcodebuild build -configuration Debug - -workspace PorcupineForegroundAppDemo.xcworkspace + -project PorcupineForegroundAppDemo.xcodeproj -sdk iphoneos -scheme _enDemo -derivedDataPath ddp @@ -53,7 +36,7 @@ jobs: - name: Build Other Language run: xcrun xcodebuild build -configuration Debug - -workspace PorcupineForegroundAppDemo.xcworkspace + -project PorcupineForegroundAppDemo.xcodeproj -sdk iphoneos -scheme deDemo -derivedDataPath ddp @@ -69,20 +52,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up Node.js LTS - uses: actions/setup-node@v3 - with: - node-version: lts/* - - name: Install Cocoapods run: gem install cocoapods - - name: Install AppCenter CLI - run: npm install -g appcenter-cli - - - name: Make build dir - run: mkdir ddp - - name: Run Cocoapods run: pod install diff --git a/.github/workflows/react-native-demos.yml b/.github/workflows/react-native-demos.yml index abf3404bd5..9855b1905e 100644 --- a/.github/workflows/react-native-demos.yml +++ b/.github/workflows/react-native-demos.yml @@ -35,6 +35,15 @@ jobs: with: node-version: ${{ matrix.node-version }} +# REMOVE + - name: Build binding + run: yarn && yarn pkg + working-directory: binding/react-native + + - name: Build binding + run: yarn add ../../binding/react-native/pkg/picovoice-porcupine-react-native-3.0.3.tgz +# REMOVE + - name: Install dependencies run: yarn android-install @@ -60,6 +69,15 @@ jobs: with: node-version: ${{ matrix.node-version }} +# REMOVE + - name: Build binding + run: yarn && yarn pkg + working-directory: binding/react-native + + - name: Build binding + run: yarn add ../../binding/react-native/pkg/picovoice-porcupine-react-native-3.0.3.tgz +# REMOVE + - name: Install dependencies run: yarn ios-install diff --git a/.gitignore b/.gitignore index 4c073ed7e4..96b51a647d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,7 @@ _ReSharper.Caches/ build dist pvporcupine.egg-info -demo/c/cmake-build-debug/ \ No newline at end of file +demo/c/cmake-build-debug/ +.build +Package.resolved +.swiftpm \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index e554c886a7..687f4255b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "binding/unity/VoiceProcessor"] path = binding/unity/VoiceProcessor - url = ../unity-voice-processor.git + url = https://github.com/Picovoice/unity-voice-processor.git [submodule "demo/c/dr_libs"] path = demo/c/dr_libs - url = ../../mackron/dr_libs.git + url = https://github.com/mackron/dr_libs.git [submodule "demo/c/pvrecorder"] path = demo/c/pvrecorder - url = ../pvrecorder.git + url = https://github.com/Picovoice/pvrecorder.git diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000000..cdebb0ab0b --- /dev/null +++ b/Package.swift @@ -0,0 +1,64 @@ +// swift-tools-version:5.3 +import PackageDescription + +let package = Package( + name: "Porcupine-iOS", + platforms: [ + .iOS(.v13) + ], + products: [ + .library( + name: "Porcupine", + targets: ["Porcupine"] + ) + ], + dependencies: [ + .package( + url: "https://github.com/Picovoice/ios-voice-processor.git", + .upToNextMajor(from: "1.2.0") + ) + ], + targets: [ + .binaryTarget( + name: "PvPorcupine", + path: "lib/ios/PvPorcupine.xcframework" + ), + .target( + name: "Porcupine", + dependencies: [ + "PvPorcupine", + .product(name: "ios_voice_processor", package: "ios-voice-processor") + ], + path: ".", + exclude: [ + "binding/ios/PorcupineAppTest", + "binding/flutter", + "binding/react-native", + "binding/unity", + "demo" + ], + sources: [ + "binding/ios/Porcupine.swift", + "binding/ios/PorcupineErrors.swift", + "binding/ios/PorcupineManager.swift" + ], + resources: [ + .copy("resources/keyword_files/ios/alexa_ios.ppn"), + .copy("resources/keyword_files/ios/americano_ios.ppn"), + .copy("resources/keyword_files/ios/blueberry_ios.ppn"), + .copy("resources/keyword_files/ios/bumblebee_ios.ppn"), + .copy("resources/keyword_files/ios/computer_ios.ppn"), + .copy("resources/keyword_files/ios/grapefruit_ios.ppn"), + .copy("resources/keyword_files/ios/grasshopper_ios.ppn"), + .copy("resources/keyword_files/ios/hey google_ios.ppn"), + .copy("resources/keyword_files/ios/hey siri_ios.ppn"), + .copy("resources/keyword_files/ios/jarvis_ios.ppn"), + .copy("resources/keyword_files/ios/ok google_ios.ppn"), + .copy("resources/keyword_files/ios/picovoice_ios.ppn"), + .copy("resources/keyword_files/ios/porcupine_ios.ppn"), + .copy("resources/keyword_files/ios/terminator_ios.ppn"), + .copy("lib/common/porcupine_params.pv") + ] + ) + ] +) diff --git a/binding/flutter/CHANGELOG.md b/binding/flutter/CHANGELOG.md index fc5da41925..5ce120248a 100644 --- a/binding/flutter/CHANGELOG.md +++ b/binding/flutter/CHANGELOG.md @@ -61,4 +61,7 @@ * Address locale issue ## [3.0.3] - 2024-02-08 -* Additional gradle plugin build support \ No newline at end of file +* Additional gradle plugin build support + +## [3.0.4] - 2024-10-28 +* Update native packages \ No newline at end of file diff --git a/binding/flutter/ios/porcupine_flutter.podspec b/binding/flutter/ios/porcupine_flutter.podspec index cfdaf89f5a..9a83e33f08 100644 --- a/binding/flutter/ios/porcupine_flutter.podspec +++ b/binding/flutter/ios/porcupine_flutter.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'porcupine_flutter' - s.version = '3.0.3' + s.version = '3.0.4' s.summary = 'A Flutter package plugin for Picovoice\'s Porcupine wake word engine' s.description = <<-DESC A Flutter package plugin for Picovoice\'s Porcupine wake word engine. @@ -12,6 +12,6 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.platform = :ios, '13.0' s.dependency 'Flutter' - s.dependency 'Porcupine-iOS', '~> 3.0.1' + s.dependency 'Porcupine-iOS', '~> 3.0.4' s.swift_version = '5.0' end \ No newline at end of file diff --git a/binding/flutter/pubspec.lock b/binding/flutter/pubspec.lock index 5e8df7e3e4..b4ee345eed 100644 --- a/binding/flutter/pubspec.lock +++ b/binding/flutter/pubspec.lock @@ -79,10 +79,10 @@ packages: dependency: "direct main" description: name: flutter_voice_processor - sha256: "3c91d8ab34b33016643ae7586a305b81c47c1b66a95b489807c34f127537fcbc" + sha256: "8ae3fc196d6060a13392e4ca557f7a2f4a6b87898ae519787f6929f986538572" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" lints: dependency: "direct dev" description: diff --git a/binding/flutter/pubspec.yaml b/binding/flutter/pubspec.yaml index 4c0ca669b6..30f2642a97 100644 --- a/binding/flutter/pubspec.yaml +++ b/binding/flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: porcupine_flutter description: A Flutter plugin for Picovoice's Porcupine offline wake word engine. -version: 3.0.3 +version: 3.0.4 homepage: https://picovoice.ai/ repository: https://github.com/Picovoice/porcupine/ documentation: https://picovoice.ai/docs/porcupine/ @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter - flutter_voice_processor: ^1.1.1 + flutter_voice_processor: ^1.1.2 dev_dependencies: flutter_test: diff --git a/binding/ios/Porcupine-iOS.podspec b/binding/ios/Porcupine-iOS.podspec index 41eb9a502b..0b020ce688 100644 --- a/binding/ios/Porcupine-iOS.podspec +++ b/binding/ios/Porcupine-iOS.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'Porcupine-iOS' s.module_name = 'Porcupine' - s.version = '3.0.2' + s.version = '3.0.4' s.license = {:type => 'Apache 2.0'} s.summary = 'iOS SDK for Picovoice\'s Porcupine wake word engine' s.description = @@ -22,7 +22,7 @@ Pod::Spec.new do |s| DESC s.homepage = 'https://github.com/Picovoice/porcupine/tree/master/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } - s.source = { :git => "https://github.com/Picovoice/porcupine.git", :tag => "Porcupine-iOS-v3.0.2" } + s.source = { :git => "https://github.com/Picovoice/porcupine.git", :tag => s.version.to_s } s.ios.deployment_target = '13.0' s.swift_version = '5.0' s.vendored_frameworks = 'lib/ios/PvPorcupine.xcframework' @@ -35,5 +35,5 @@ Pod::Spec.new do |s| s.source_files = 'binding/ios/*.{swift}' s.exclude_files = 'binding/ios/PorcupineAppTest/**' - s.dependency 'ios-voice-processor', '~> 1.1.1' + s.dependency 'ios-voice-processor', '~> 1.2.0' end diff --git a/binding/ios/Porcupine.swift b/binding/ios/Porcupine.swift index 2a69c2d73a..39531e9147 100644 --- a/binding/ios/Porcupine.swift +++ b/binding/ios/Porcupine.swift @@ -7,11 +7,19 @@ // specific language governing permissions and limitations under the License. // +import Foundation + import PvPorcupine /// Low-level iOS binding for Porcupine wake word engine. Provides a Swift interface to the Porcupine library. public class Porcupine { +#if SWIFT_PACKAGE + + static let resourceBundle = Bundle.module + +#else + static let resourceBundle: Bundle = { let myBundle = Bundle(for: Porcupine.self) @@ -25,6 +33,8 @@ public class Porcupine { return resourceBundle }() +#endif + public enum BuiltInKeyword: String, CaseIterable { case alexa = "Alexa" case americano = "Americano" diff --git a/binding/ios/PorcupineAppTest/Podfile b/binding/ios/PorcupineAppTest/Podfile deleted file mode 100644 index ab7abfd2cf..0000000000 --- a/binding/ios/PorcupineAppTest/Podfile +++ /dev/null @@ -1,14 +0,0 @@ -source 'https://cdn.cocoapods.org/' -platform :ios, '13.0' - -target 'PorcupineAppTest' do - pod 'Porcupine-iOS', '~> 3.0.2' -end - -target 'PorcupineAppTestUITests' do - pod 'Porcupine-iOS', '~> 3.0.2' -end - -target 'PerformanceTest' do - pod 'Porcupine-iOS', '~> 3.0.2' -end diff --git a/binding/ios/PorcupineAppTest/Podfile.lock b/binding/ios/PorcupineAppTest/Podfile.lock deleted file mode 100644 index 5fc141f859..0000000000 --- a/binding/ios/PorcupineAppTest/Podfile.lock +++ /dev/null @@ -1,20 +0,0 @@ -PODS: - - ios-voice-processor (1.1.1) - - Porcupine-iOS (3.0.2): - - ios-voice-processor (~> 1.1.1) - -DEPENDENCIES: - - Porcupine-iOS (~> 3.0.2) - -SPEC REPOS: - trunk: - - ios-voice-processor - - Porcupine-iOS - -SPEC CHECKSUMS: - ios-voice-processor: 4035132542c7ae07f1e459c6d276b6da000302bb - Porcupine-iOS: b8408a28fe3df81ea8d8f3cf1e5a04823ffb71d3 - -PODFILE CHECKSUM: d8426d3e6ec4d9a1538d6a8c22a573e309be57cf - -COCOAPODS: 1.11.3 diff --git a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcodeproj/project.pbxproj b/binding/ios/PorcupineAppTest/PorcupineAppTest.xcodeproj/project.pbxproj index bdf9e084d0..f6a6d95e75 100644 --- a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcodeproj/project.pbxproj +++ b/binding/ios/PorcupineAppTest/PorcupineAppTest.xcodeproj/project.pbxproj @@ -3,10 +3,15 @@ archiveVersion = 1; classes = { }; - objectVersion = 55; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ + 02C7054B2CCB14450002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7054A2CCB14450002B3E4 /* Porcupine */; }; + 02C7054E2CCB14980002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7054D2CCB14980002B3E4 /* Porcupine */; }; + 02C705502CCB14B50002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7054F2CCB14B50002B3E4 /* Porcupine */; }; + 02C705532CCB15430002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705522CCB15430002B3E4 /* Porcupine */; }; + 02C705562CCB156D0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705552CCB156D0002B3E4 /* Porcupine */; }; 1E5B7AA127FFC12000F8BDDB /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32769C288BB32DEA6645EC92 /* PerformanceTest.swift */; }; 1E5B7ABA27FFC18400F8BDDB /* multiple_keywords.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1E5B7AB927FFC18400F8BDDB /* multiple_keywords.wav */; }; 1E7744B427CD9D7E00491D0B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7744B327CD9D7E00491D0B /* AppDelegate.swift */; }; @@ -15,12 +20,9 @@ 1E7744BD27CD9D7F00491D0B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1E7744BC27CD9D7F00491D0B /* Assets.xcassets */; }; 1E7744C027CD9D7F00491D0B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E7744BE27CD9D7F00491D0B /* LaunchScreen.storyboard */; }; 1E7744D527CD9D7F00491D0B /* PorcupineAppTestUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7744D427CD9D7F00491D0B /* PorcupineAppTestUITests.swift */; }; - 3F4E730C6560BFF8341FBC2B /* libPods-PerformanceTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2462DC7A128733C7CD7686B0 /* libPods-PerformanceTest.a */; }; - 6F1FBE676D2C52FF23098433 /* libPods-PorcupineAppTestUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 011FA47DB36286585DA78022 /* libPods-PorcupineAppTestUITests.a */; }; A52A751425D956A94947A6AF /* PorcupineLanguageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A52A78D82E189D1EA9423736 /* PorcupineLanguageTests.swift */; }; A52A78ED18AA4EDB33D95C4D /* BaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A52A7583A49E7ACAA9C7A0C5 /* BaseTest.swift */; }; C765AF9029AD7B75009D2BC2 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = C765AF8F29AD7B75009D2BC2 /* test_resources */; }; - D6D823302608F81422F3B98A /* libPods-PorcupineAppTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE86B9731F9D981EE76C21A /* libPods-PorcupineAppTest.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -41,8 +43,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 011FA47DB36286585DA78022 /* libPods-PorcupineAppTestUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PorcupineAppTestUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0EE86B9731F9D981EE76C21A /* libPods-PorcupineAppTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PorcupineAppTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1E5B7AB727FFC12000F8BDDB /* PerformanceTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1E5B7AB827FFC15100F8BDDB /* info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = info.plist; sourceTree = ""; }; 1E5B7AB927FFC18400F8BDDB /* multiple_keywords.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = multiple_keywords.wav; path = ../../../../resources/audio_samples/multiple_keywords.wav; sourceTree = ""; }; @@ -56,17 +56,10 @@ 1E7744D027CD9D7F00491D0B /* PorcupineAppTestUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PorcupineAppTestUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1E7744D427CD9D7F00491D0B /* PorcupineAppTestUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PorcupineAppTestUITests.swift; sourceTree = ""; }; 1E7744E327CDA13600491D0B /* info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = info.plist; sourceTree = ""; }; - 2462DC7A128733C7CD7686B0 /* libPods-PerformanceTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PerformanceTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D198D7EAF41809AAC56B915 /* Pods-PorcupineAppTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineAppTest.release.xcconfig"; path = "Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest.release.xcconfig"; sourceTree = ""; }; 32769C288BB32DEA6645EC92 /* PerformanceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PerformanceTest.swift; sourceTree = ""; }; - 4D7093B8281C71FD0E23E0DC /* Pods-PorcupineAppTestUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineAppTestUITests.debug.xcconfig"; path = "Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests.debug.xcconfig"; sourceTree = ""; }; - 5F1DBC0ABD84F719FC65D140 /* Pods-PorcupineAppTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineAppTest.debug.xcconfig"; path = "Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest.debug.xcconfig"; sourceTree = ""; }; - 6CED4EA1CCD169B32C0E34EB /* Pods-PerformanceTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.release.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.release.xcconfig"; sourceTree = ""; }; - 9BBD91828D5A85912D7932D4 /* Pods-PerformanceTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.debug.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.debug.xcconfig"; sourceTree = ""; }; A52A7583A49E7ACAA9C7A0C5 /* BaseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTest.swift; sourceTree = ""; }; A52A78D82E189D1EA9423736 /* PorcupineLanguageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PorcupineLanguageTests.swift; sourceTree = ""; }; C765AF8F29AD7B75009D2BC2 /* test_resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = test_resources; sourceTree = ""; }; - E5391C493E5CF88A08DBDADF /* Pods-PorcupineAppTestUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineAppTestUITests.release.xcconfig"; path = "Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -74,7 +67,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3F4E730C6560BFF8341FBC2B /* libPods-PerformanceTest.a in Frameworks */, + 02C705502CCB14B50002B3E4 /* Porcupine in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -82,7 +75,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D6D823302608F81422F3B98A /* libPods-PorcupineAppTest.a in Frameworks */, + 02C705562CCB156D0002B3E4 /* Porcupine in Frameworks */, + 02C705532CCB15430002B3E4 /* Porcupine in Frameworks */, + 02C7054B2CCB14450002B3E4 /* Porcupine in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,26 +85,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6F1FBE676D2C52FF23098433 /* libPods-PorcupineAppTestUITests.a in Frameworks */, + 02C7054E2CCB14980002B3E4 /* Porcupine in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1AF96756F2A5FC2840F81D99 /* Pods */ = { - isa = PBXGroup; - children = ( - 5F1DBC0ABD84F719FC65D140 /* Pods-PorcupineAppTest.debug.xcconfig */, - 2D198D7EAF41809AAC56B915 /* Pods-PorcupineAppTest.release.xcconfig */, - 4D7093B8281C71FD0E23E0DC /* Pods-PorcupineAppTestUITests.debug.xcconfig */, - E5391C493E5CF88A08DBDADF /* Pods-PorcupineAppTestUITests.release.xcconfig */, - 9BBD91828D5A85912D7932D4 /* Pods-PerformanceTest.debug.xcconfig */, - 6CED4EA1CCD169B32C0E34EB /* Pods-PerformanceTest.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; 1E5B7A9A27FFC0C400F8BDDB /* PerformanceTest */ = { isa = PBXGroup; children = ( @@ -127,8 +109,6 @@ 1E7744B227CD9D7E00491D0B /* PorcupineAppTest */, 1E7744D327CD9D7F00491D0B /* PorcupineAppTestUITests */, 1E7744B127CD9D7E00491D0B /* Products */, - 1AF96756F2A5FC2840F81D99 /* Pods */, - CF8A3E0166575C420DB0878C /* Frameworks */, ); sourceTree = ""; }; @@ -167,16 +147,6 @@ path = PorcupineAppTestUITests; sourceTree = ""; }; - CF8A3E0166575C420DB0878C /* Frameworks */ = { - isa = PBXGroup; - children = ( - 0EE86B9731F9D981EE76C21A /* libPods-PorcupineAppTest.a */, - 2462DC7A128733C7CD7686B0 /* libPods-PerformanceTest.a */, - 011FA47DB36286585DA78022 /* libPods-PorcupineAppTestUITests.a */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -184,12 +154,9 @@ isa = PBXNativeTarget; buildConfigurationList = 1E5B7AB427FFC12000F8BDDB /* Build configuration list for PBXNativeTarget "PerformanceTest" */; buildPhases = ( - 1E5B7A9E27FFC12000F8BDDB /* [CP] Check Pods Manifest.lock */, 1E5B7A9F27FFC12000F8BDDB /* Sources */, 1E5B7AA227FFC12000F8BDDB /* Frameworks */, 1E5B7AA427FFC12000F8BDDB /* Resources */, - 1E5B7AB227FFC12000F8BDDB /* [CP] Embed Pods Frameworks */, - 1E5B7AB327FFC12000F8BDDB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -205,12 +172,9 @@ isa = PBXNativeTarget; buildConfigurationList = 1E7744DA27CD9D7F00491D0B /* Build configuration list for PBXNativeTarget "PorcupineAppTest" */; buildPhases = ( - CDB20140BC68BCC585CA09BB /* [CP] Check Pods Manifest.lock */, 1E7744AC27CD9D7E00491D0B /* Sources */, 1E7744AD27CD9D7E00491D0B /* Frameworks */, 1E7744AE27CD9D7E00491D0B /* Resources */, - 5486355F091503BA975B5F40 /* [CP] Embed Pods Frameworks */, - FE8746844E35CF0F2ED2DE04 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -225,12 +189,9 @@ isa = PBXNativeTarget; buildConfigurationList = 1E7744E027CD9D7F00491D0B /* Build configuration list for PBXNativeTarget "PorcupineAppTestUITests" */; buildPhases = ( - C1FCD34E9D9E2DA3ED8AF385 /* [CP] Check Pods Manifest.lock */, 1E7744CC27CD9D7F00491D0B /* Sources */, 1E7744CD27CD9D7F00491D0B /* Frameworks */, 1E7744CE27CD9D7F00491D0B /* Resources */, - 1EF8F08FE0010CAA361B2C07 /* [CP] Embed Pods Frameworks */, - 5384AF5D08333CAF7192A454 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -273,6 +234,9 @@ Base, ); mainGroup = 1E7744A727CD9D7E00491D0B; + packageReferences = ( + 02C705542CCB156D0002B3E4 /* XCLocalSwiftPackageReference "../../../../porcupine" */, + ); productRefGroup = 1E7744B127CD9D7E00491D0B /* Products */; projectDirPath = ""; projectRoot = ""; @@ -313,177 +277,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 1E5B7A9E27FFC12000F8BDDB /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PerformanceTest-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 1E5B7AB227FFC12000F8BDDB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1E5B7AB327FFC12000F8BDDB /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1EF8F08FE0010CAA361B2C07 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5384AF5D08333CAF7192A454 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTestUITests/Pods-PorcupineAppTestUITests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5486355F091503BA975B5F40 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - C1FCD34E9D9E2DA3ED8AF385 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PorcupineAppTestUITests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - CDB20140BC68BCC585CA09BB /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PorcupineAppTest-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - FE8746844E35CF0F2ED2DE04 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineAppTest/Pods-PorcupineAppTest-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 1E5B7A9F27FFC12000F8BDDB /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -549,7 +342,6 @@ /* Begin XCBuildConfiguration section */ 1E5B7AB527FFC12000F8BDDB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9BBD91828D5A85912D7932D4 /* Pods-PerformanceTest.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -572,7 +364,6 @@ }; 1E5B7AB627FFC12000F8BDDB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6CED4EA1CCD169B32C0E34EB /* Pods-PerformanceTest.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -711,7 +502,6 @@ }; 1E7744DB27CD9D7F00491D0B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5F1DBC0ABD84F719FC65D140 /* Pods-PorcupineAppTest.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -742,7 +532,6 @@ }; 1E7744DC27CD9D7F00491D0B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2D198D7EAF41809AAC56B915 /* Pods-PorcupineAppTest.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -772,7 +561,6 @@ }; 1E7744E127CD9D7F00491D0B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4D7093B8281C71FD0E23E0DC /* Pods-PorcupineAppTestUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -795,7 +583,6 @@ }; 1E7744E227CD9D7F00491D0B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E5391C493E5CF88A08DBDADF /* Pods-PorcupineAppTestUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -856,6 +643,48 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 02C705542CCB156D0002B3E4 /* XCLocalSwiftPackageReference "../../../../porcupine" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../../../porcupine; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 02C705512CCB15430002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 90fb6b91266c68ed26d4fa0ba7eb67195c362cc9; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 02C7054A2CCB14450002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7054D2CCB14980002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7054F2CCB14B50002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705522CCB15430002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705512CCB15430002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705552CCB156D0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 1E7744A827CD9D7E00491D0B /* Project object */; } diff --git a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/contents.xcworkspacedata b/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 48e690c633..0000000000 --- a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d..0000000000 --- a/binding/ios/PorcupineAppTest/PorcupineAppTest.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/binding/ios/PorcupineErrors.swift b/binding/ios/PorcupineErrors.swift index 309ac84886..151b1f11a5 100644 --- a/binding/ios/PorcupineErrors.swift +++ b/binding/ios/PorcupineErrors.swift @@ -7,6 +7,8 @@ // specific language governing permissions and limitations under the License. // +import Foundation + public class PorcupineError: LocalizedError { private let message: String private let messageStack: [String] diff --git a/binding/ios/PorcupineManager.swift b/binding/ios/PorcupineManager.swift index 06ceab6ea2..7c6278394d 100644 --- a/binding/ios/PorcupineManager.swift +++ b/binding/ios/PorcupineManager.swift @@ -7,6 +7,8 @@ // specific language governing permissions and limitations under the License. // +import Dispatch + import ios_voice_processor /// High-level iOS binding for Porcupine wake word engine. It handles recording audio from microphone, diff --git a/binding/ios/README.md b/binding/ios/README.md index a91cc5c7e5..34adc94027 100644 --- a/binding/ios/README.md +++ b/binding/ios/README.md @@ -17,9 +17,15 @@ To learn more about Porcupine, see the [product](https://picovoice.ai/products/p ## Installation -The Porcupine iOS binding is available via [CocoaPods](https://cocoapods.org/pods/Porcupine-iOS). To import it into your iOS project, add the following line to your Podfile: +The Porcupine iOS binding is available via [Swift Package Manger](https://www.swift.org/documentation/package-manager/) or [CocoaPods](https://cocoapods.org/pods/Porcupine-iOS). +To import the package using SPM, open up your project's Package Dependencies in XCode and add: +``` +https://github.com/Picovoice/porcupine.git +``` + +To import it into your iOS project using CocoaPods, add the following line to your Podfile: ```ruby pod 'Porcupine-iOS' ``` @@ -183,7 +189,7 @@ In order to detect non-English wake words you need to use the corresponding mode ## Running Unit Tests -Open [`PorcupineAppTest.xcworkspace`](PorcupineAppTest/PorcupineAppTest.xcworkspace) with XCode and run the tests with `Product > Test`. +Open [`PorcupineAppTest.xcodeproj`](PorcupineAppTest/PorcupineAppTest.xcodeproj) with XCode and run the tests with `Product > Test`. ## Demo App diff --git a/binding/react-native/package.json b/binding/react-native/package.json index fcdf77df78..f90163ce56 100644 --- a/binding/react-native/package.json +++ b/binding/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/porcupine-react-native", - "version": "3.0.2", + "version": "3.0.3", "description": "Picovoice Porcupine React Native binding", "main": "lib/commonjs/index", "module": "lib/module/index", @@ -36,7 +36,7 @@ }, "homepage": "https://github.com/Picovoice/porcupine/#readme", "devDependencies": { - "@picovoice/react-native-voice-processor": "^1.2.2", + "@picovoice/react-native-voice-processor": "^1.2.3", "@react-native-community/eslint-config": "^3.2.0", "@types/jest": "^26.0.0", "@types/react": "^16.9.19", @@ -55,7 +55,7 @@ "typescript": "^4.9.3" }, "peerDependencies": { - "@picovoice/react-native-voice-processor": ">= 1.2.2", + "@picovoice/react-native-voice-processor": ">= 1.2.3", "react": ">= 17.0", "react-native": ">= 0.63" }, diff --git a/binding/react-native/porcupine-react-native.podspec b/binding/react-native/porcupine-react-native.podspec index fba61f3c85..461b316add 100644 --- a/binding/react-native/porcupine-react-native.podspec +++ b/binding/react-native/porcupine-react-native.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.source_files = "ios/*.{h,m,mm,swift}" s.dependency "React" - s.dependency "Porcupine-iOS", '~> 3.0.1' + s.dependency "Porcupine-iOS", '~> 3.0.4' end diff --git a/binding/react-native/test-app/PorcupineTestApp/ios/Podfile b/binding/react-native/test-app/PorcupineTestApp/ios/Podfile index bbdbe3b090..b7ffde6233 100644 --- a/binding/react-native/test-app/PorcupineTestApp/ios/Podfile +++ b/binding/react-native/test-app/PorcupineTestApp/ios/Podfile @@ -28,7 +28,7 @@ target 'PorcupineTestApp' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => flipper_config, + :flipper_configuration => FlipperConfiguration.disabled, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -46,5 +46,10 @@ target 'PorcupineTestApp' do :mac_catalyst_enabled => false ) __apply_Xcode_12_5_M1_post_install_workaround(installer) + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + end + end end end diff --git a/binding/react-native/test-app/PorcupineTestApp/ios/Podfile.lock b/binding/react-native/test-app/PorcupineTestApp/ios/Podfile.lock index 4dd1bdbcbf..5379a4a78d 100644 --- a/binding/react-native/test-app/PorcupineTestApp/ios/Podfile.lock +++ b/binding/react-native/test-app/PorcupineTestApp/ios/Podfile.lock @@ -1,88 +1,25 @@ PODS: - boost (1.76.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.71.0) - - FBReactNativeSpec (0.71.0): + - FBLazyVector (0.71.18) + - FBReactNativeSpec (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.71.0) - - RCTTypeSafety (= 0.71.0) - - React-Core (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - Flipper (0.125.0): - - Flipper-Folly (~> 2.6) - - Flipper-RSocket (~> 1.4) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.2.0.1) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.10): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.5.0.5) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.4.3): - - Flipper-Folly (~> 2.6) - - FlipperKit (0.125.0): - - FlipperKit/Core (= 0.125.0) - - FlipperKit/Core (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): - - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.125.0) - - FlipperKit/FKPortForwarding (0.125.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.125.0) - - FlipperKit/FlipperKitLayoutHelpers (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutIOSDescriptors - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin + - RCTRequired (= 0.71.18) + - RCTTypeSafety (= 0.71.18) + - React-Core (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.71.0): - - hermes-engine/Pre-built (= 0.71.0) - - hermes-engine/Pre-built (0.71.0) - - ios-voice-processor (1.1.0) + - hermes-engine (0.71.18): + - hermes-engine/Pre-built (= 0.71.18) + - hermes-engine/Pre-built (0.71.18) + - ios-voice-processor (1.2.0) - libevent (2.1.12) - - OpenSSL-Universal (1.1.1100) - - Porcupine-iOS (3.0.1): - - ios-voice-processor (~> 1.1.0) - - porcupine-react-native (3.0.1): - - Porcupine-iOS (~> 3.0.1) + - Porcupine-iOS (3.0.4): + - ios-voice-processor (~> 1.2.0) + - porcupine-react-native (3.0.3): + - Porcupine-iOS (~> 3.0.4) - React - RCT-Folly (2021.07.22.00): - boost @@ -101,26 +38,26 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.71.0) - - RCTTypeSafety (0.71.0): - - FBLazyVector (= 0.71.0) - - RCTRequired (= 0.71.0) - - React-Core (= 0.71.0) - - React (0.71.0): - - React-Core (= 0.71.0) - - React-Core/DevSupport (= 0.71.0) - - React-Core/RCTWebSocket (= 0.71.0) - - React-RCTActionSheet (= 0.71.0) - - React-RCTAnimation (= 0.71.0) - - React-RCTBlob (= 0.71.0) - - React-RCTImage (= 0.71.0) - - React-RCTLinking (= 0.71.0) - - React-RCTNetwork (= 0.71.0) - - React-RCTSettings (= 0.71.0) - - React-RCTText (= 0.71.0) - - React-RCTVibration (= 0.71.0) - - React-callinvoker (0.71.0) - - React-Codegen (0.71.0): + - RCTRequired (0.71.18) + - RCTTypeSafety (0.71.18): + - FBLazyVector (= 0.71.18) + - RCTRequired (= 0.71.18) + - React-Core (= 0.71.18) + - React (0.71.18): + - React-Core (= 0.71.18) + - React-Core/DevSupport (= 0.71.18) + - React-Core/RCTWebSocket (= 0.71.18) + - React-RCTActionSheet (= 0.71.18) + - React-RCTAnimation (= 0.71.18) + - React-RCTBlob (= 0.71.18) + - React-RCTImage (= 0.71.18) + - React-RCTLinking (= 0.71.18) + - React-RCTNetwork (= 0.71.18) + - React-RCTSettings (= 0.71.18) + - React-RCTText (= 0.71.18) + - React-RCTVibration (= 0.71.18) + - React-callinvoker (0.71.18) + - React-Codegen (0.71.18): - FBReactNativeSpec - hermes-engine - RCT-Folly @@ -131,299 +68,309 @@ PODS: - React-jsiexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.0): + - React-Core (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.0) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-Core/Default (= 0.71.18) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/CoreModulesHeaders (0.71.0): + - React-Core/CoreModulesHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/Default (0.71.0): + - React-Core/Default (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/DevSupport (0.71.0): + - React-Core/DevSupport (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.0) - - React-Core/RCTWebSocket (= 0.71.0) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-jsinspector (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-Core/Default (= 0.71.18) + - React-Core/RCTWebSocket (= 0.71.18) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-jsinspector (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.0): + - React-Core/RCTActionSheetHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTAnimationHeaders (0.71.0): + - React-Core/RCTAnimationHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTBlobHeaders (0.71.0): + - React-Core/RCTBlobHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTImageHeaders (0.71.0): + - React-Core/RCTImageHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTLinkingHeaders (0.71.0): + - React-Core/RCTLinkingHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTNetworkHeaders (0.71.0): + - React-Core/RCTNetworkHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTSettingsHeaders (0.71.0): + - React-Core/RCTSettingsHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTTextHeaders (0.71.0): + - React-Core/RCTTextHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTVibrationHeaders (0.71.0): + - React-Core/RCTVibrationHeaders (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-Core/RCTWebSocket (0.71.0): + - React-Core/RCTWebSocket (0.71.18): - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.0) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-Core/Default (= 0.71.18) + - React-cxxreact (= 0.71.18) + - React-hermes + - React-jsi (= 0.71.18) + - React-jsiexecutor (= 0.71.18) + - React-perflogger (= 0.71.18) - Yoga - - React-CoreModules (0.71.0): + - React-CoreModules (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.0) - - React-Codegen (= 0.71.0) - - React-Core/CoreModulesHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - React-RCTImage (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-cxxreact (0.71.0): + - RCTTypeSafety (= 0.71.18) + - React-Codegen (= 0.71.18) + - React-Core/CoreModulesHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - React-RCTBlob + - React-RCTImage (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-cxxreact (0.71.18): - boost (= 1.76.0) - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.0) - - React-jsi (= 0.71.0) - - React-jsinspector (= 0.71.0) - - React-logger (= 0.71.0) - - React-perflogger (= 0.71.0) - - React-runtimeexecutor (= 0.71.0) - - React-hermes (0.71.0): + - React-callinvoker (= 0.71.18) + - React-jsi (= 0.71.18) + - React-jsinspector (= 0.71.18) + - React-logger (= 0.71.18) + - React-perflogger (= 0.71.18) + - React-runtimeexecutor (= 0.71.18) + - React-hermes (0.71.18): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.71.0) - - React-jsiexecutor (= 0.71.0) - - React-jsinspector (= 0.71.0) - - React-perflogger (= 0.71.0) - - React-jsi (0.71.0): + - React-cxxreact (= 0.71.18) + - React-jsi + - React-jsiexecutor (= 0.71.18) + - React-jsinspector (= 0.71.18) + - React-perflogger (= 0.71.18) + - React-jsi (0.71.18): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.0): + - React-jsiexecutor (0.71.18): - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-perflogger (= 0.71.0) - - React-jsinspector (0.71.0) - - React-logger (0.71.0): + - React-cxxreact (= 0.71.18) + - React-jsi (= 0.71.18) + - React-perflogger (= 0.71.18) + - React-jsinspector (0.71.18) + - React-logger (0.71.18): - glog - - react-native-voice-processor (1.2.0): - - ios-voice-processor (~> 1.1.0) + - react-native-voice-processor (1.2.3): + - ios-voice-processor (~> 1.2.0) - React-Core - - React-perflogger (0.71.0) - - React-RCTActionSheet (0.71.0): - - React-Core/RCTActionSheetHeaders (= 0.71.0) - - React-RCTAnimation (0.71.0): + - React-perflogger (0.71.18) + - React-RCTActionSheet (0.71.18): + - React-Core/RCTActionSheetHeaders (= 0.71.18) + - React-RCTAnimation (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.0) - - React-Codegen (= 0.71.0) - - React-Core/RCTAnimationHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTAppDelegate (0.71.0): + - RCTTypeSafety (= 0.71.18) + - React-Codegen (= 0.71.18) + - React-Core/RCTAnimationHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTAppDelegate (0.71.18): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.0): + - React-RCTBlob (0.71.18): + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.0) - - React-Core/RCTBlobHeaders (= 0.71.0) - - React-Core/RCTWebSocket (= 0.71.0) - - React-jsi (= 0.71.0) - - React-RCTNetwork (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTImage (0.71.0): + - React-Codegen (= 0.71.18) + - React-Core/RCTBlobHeaders (= 0.71.18) + - React-Core/RCTWebSocket (= 0.71.18) + - React-jsi (= 0.71.18) + - React-RCTNetwork (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTImage (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.0) - - React-Codegen (= 0.71.0) - - React-Core/RCTImageHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - React-RCTNetwork (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTLinking (0.71.0): - - React-Codegen (= 0.71.0) - - React-Core/RCTLinkingHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTNetwork (0.71.0): + - RCTTypeSafety (= 0.71.18) + - React-Codegen (= 0.71.18) + - React-Core/RCTImageHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - React-RCTNetwork (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTLinking (0.71.18): + - React-Codegen (= 0.71.18) + - React-Core/RCTLinkingHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTNetwork (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.0) - - React-Codegen (= 0.71.0) - - React-Core/RCTNetworkHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTSettings (0.71.0): + - RCTTypeSafety (= 0.71.18) + - React-Codegen (= 0.71.18) + - React-Core/RCTNetworkHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTSettings (0.71.18): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.0) - - React-Codegen (= 0.71.0) - - React-Core/RCTSettingsHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-RCTText (0.71.0): - - React-Core/RCTTextHeaders (= 0.71.0) - - React-RCTVibration (0.71.0): + - RCTTypeSafety (= 0.71.18) + - React-Codegen (= 0.71.18) + - React-Core/RCTSettingsHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-RCTText (0.71.18): + - React-Core/RCTTextHeaders (= 0.71.18) + - React-RCTVibration (0.71.18): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.0) - - React-Core/RCTVibrationHeaders (= 0.71.0) - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/core (= 0.71.0) - - React-runtimeexecutor (0.71.0): - - React-jsi (= 0.71.0) - - ReactCommon/turbomodule/bridging (0.71.0): + - React-Codegen (= 0.71.18) + - React-Core/RCTVibrationHeaders (= 0.71.18) + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/core (= 0.71.18) + - React-runtimeexecutor (0.71.18): + - React-jsi (= 0.71.18) + - ReactCommon/turbomodule/bridging (0.71.18): - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.0) - - React-Core (= 0.71.0) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-logger (= 0.71.0) - - React-perflogger (= 0.71.0) - - ReactCommon/turbomodule/core (0.71.0): + - React-callinvoker (= 0.71.18) + - React-Core (= 0.71.18) + - React-cxxreact (= 0.71.18) + - React-jsi (= 0.71.18) + - React-logger (= 0.71.18) + - React-perflogger (= 0.71.18) + - ReactCommon/turbomodule/core (0.71.18): - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.0) - - React-Core (= 0.71.0) - - React-cxxreact (= 0.71.0) - - React-jsi (= 0.71.0) - - React-logger (= 0.71.0) - - React-perflogger (= 0.71.0) + - React-callinvoker (= 0.71.18) + - React-Core (= 0.71.18) + - React-cxxreact (= 0.71.18) + - React-jsi (= 0.71.18) + - React-logger (= 0.71.18) + - React-perflogger (= 0.71.18) - RNFS (2.20.0): - React-Core - - SocketRocket (0.6.1) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - 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`) - - Flipper (= 0.125.0) - - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.2.0.1) - - Flipper-Fmt (= 7.1.7) - - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.5.0.5) - - Flipper-PeerTalk (= 0.0.4) - - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.125.0) - - FlipperKit/Core (= 0.125.0) - - FlipperKit/CppBridge (= 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) - - FlipperKit/FBDefines (= 0.125.0) - - FlipperKit/FKPortForwarding (= 0.125.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) - - FlipperKit/FlipperKitReactPlugin (= 0.125.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - "porcupine-react-native (from `../node_modules/@picovoice/porcupine-react-native`)" - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -432,7 +379,6 @@ DEPENDENCIES: - 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`) @@ -460,23 +406,10 @@ DEPENDENCIES: SPEC REPOS: trunk: - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - fmt - ios-voice-processor - libevent - - OpenSSL-Universal - Porcupine-iOS - - SocketRocket - - YogaKit EXTERNAL SOURCES: boost: @@ -555,61 +488,48 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: 57d2868c099736d80fcd648bf211b4431e51a558 - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 + boost: 7dcd2de282d72e344012f7d6564d024930a6a440 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 61839cba7a48c570b7ac3e1cd8a4d0948382202f - FBReactNativeSpec: 5a14398ccf5e27c1ca2d7109eb920594ce93c10d - Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + FBLazyVector: 5f81939bc6d6bcd3e71bba3744753c2a88991395 + FBReactNativeSpec: 282e783582935f4d4d136c8ec911655575a7a09f fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: f6e715aa6c8bd38de6c13bc85e07b0a337edaa89 - ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 + hermes-engine: 251dcc3511fc68678e2ee96dd7d175d9489b781e + ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - Porcupine-iOS: 6d69509fa587f3ac0be1adfefb48e0c6ce029fff - porcupine-react-native: f6650a418ba767c210eeb416d4e0bdbb93a209ca + Porcupine-iOS: da103a8848ce6b36acd4a5e42bb811d4532dd515 + porcupine-react-native: 2d1932ab12e4eb8130c821e8d439c23c8b5318f5 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: dea3e4163184ea57c50288c15c32c1529265c58f - RCTTypeSafety: a0834ab89159a346731e8aae55ad6e2cce61c327 - React: d877d055ff2137ca0325a4babdef3411e11f3cb7 - React-callinvoker: 77bd2701eee3acac154b11ec219e68d5a1f780ad - React-Codegen: bccc516adc1551ccfe04b0de27e345d38829b204 - React-Core: 4035f59e5bec8f3053583c6108d99c7516deb760 - React-CoreModules: b6a1f76423fea57a03e0d7a2f79d3b55cf193f2c - React-cxxreact: fe5f6ec8ae875bebc71309d1e8ef89bb966d61a6 - React-hermes: 3c8ea5e8f402db2a08b57051206d7f2ba9c75565 - React-jsi: dbf0f82c93bfd828fa05c50f2ee74dc81f711050 - React-jsiexecutor: 060dd495f1e2af3d87216f7ca8a94c55ec885b4f - React-jsinspector: 5061fcbec93fd672183dfb39cc2f65e55a0835db - React-logger: a6c0b3a807a8e81f6d7fea2e72660766f55daa50 - react-native-voice-processor: aefb0845641c7d67dd47e69606ba7ebb38aab5cd - React-perflogger: e5fc4149e9bbb972b8520277f3b23141faa47a36 - React-RCTActionSheet: 991de88216bf03ab9bb1d213d73c62ecbe64ade7 - React-RCTAnimation: b74e3d1bf5280891a573e447b487fa1db0713b5b - React-RCTAppDelegate: f52667f2dbc510f87b7988c5204e8764d50bf0c1 - React-RCTBlob: 6762787c01d5d8d18efed03764b0d58d3b79595a - React-RCTImage: 9ed7eba8dd192a49def2cad2ecaedee7e7e315b4 - React-RCTLinking: 0b58eed9af0645a161b80bf412b6b721e4585c66 - React-RCTNetwork: dc075b0eea00d8a98c928f011d9bc2458acc7092 - React-RCTSettings: 30fb3f498cfaf8a4bb47334ff9ffbe318ef78766 - React-RCTText: a631564e84a227fe24bae7c04446f36faea7fcf5 - React-RCTVibration: 55c91eccdbd435d7634efbe847086944389475b0 - React-runtimeexecutor: ac80782d9d76ba2b0f709f4de0c427fe33c352dc - ReactCommon: 20e38a9be5fe1341b5e422220877cc94034776ba + RCTRequired: 467cd79889cbcfd008d0ff7c697f73765d4578c3 + RCTTypeSafety: 71c8b219dc633684896452fee38a1e442d167dd6 + React: b807b09e4402c12dcbc44176e50533dca10d01f0 + React-callinvoker: f34a25e5656a6689ceaa419e833e7907b8fefef3 + React-Codegen: c252b1d468b0d2586f7573672a3d637884d0b5be + React-Core: 4161fa6a64a5ec632e31dd89e7e833f2d5205bb1 + React-CoreModules: a2e0234e69404f0703cb8fe288e7093388943c62 + React-cxxreact: 63102ee4eb505c1b13cc54cf975cd94ba223bc91 + React-hermes: de910b47c7f970987821998b09fda450f0a8aa4e + React-jsi: c1a489e635aef9afcc2aedfc08abaf53df6b2993 + React-jsiexecutor: a60e1117c011cbb6a95418f4bf67d6dfbbf81772 + React-jsinspector: 7218c92923292e20326a1eed3104fe90393ca449 + React-logger: 166cf6649b5ea9e26ab816073dd0e68020561d65 + react-native-voice-processor: 47d7906332e258dcd1f2ee089bdb9bf0f6809ccf + React-perflogger: c8849042b03392681ebd5d99a0775dbadfad2c74 + React-RCTActionSheet: 6bd3b502da266d69942e9ce4bc13666f90544620 + React-RCTAnimation: 63fbec04ae279b387ac786898bd5a918b8875f48 + React-RCTAppDelegate: 4cdf489597db359817035fb9d0df423ac0b28e07 + React-RCTBlob: 53d7ffeac3273365347ea7ee437e0413f9528870 + React-RCTImage: 63abc85bc7892202ac06e2f66e4a2aa1c872fadc + React-RCTLinking: ddaeb10a11319fa73b31d0e9faebb1efd15923d6 + React-RCTNetwork: 4d37a8ece3e592bc38ffe57b434b38af907a2a07 + React-RCTSettings: e211b56f3c9c636844ced4d3f8c76b0e03bc773d + React-RCTText: 502699e3064c8970ea52ad081d8ab8583d019dcb + React-RCTVibration: e14a0c49feb892af58079cdce3c0e00845a9752b + React-runtimeexecutor: 42879042777099d3a2a7985b240f1da24300a773 + ReactCommon: 6b451ad57a7859920ee0ec84163d3c42d933abd6 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 - SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: c618b544ff8bd8865cdca602f00cbcdb92fd6d31 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + Yoga: e407d2e8cc6cf5170a1dddf459f9fc612f85fcac -PODFILE CHECKSUM: 9fac28778c14bed4eb7a3cc813cae619223e179f +PODFILE CHECKSUM: 19318900b975ede98741530277b6e585ec3f18be COCOAPODS: 1.11.3 diff --git a/binding/react-native/test-app/PorcupineTestApp/ios/PorcupineTestApp.xcodeproj/project.pbxproj b/binding/react-native/test-app/PorcupineTestApp/ios/PorcupineTestApp.xcodeproj/project.pbxproj index 021742fe74..3922c5adf3 100644 --- a/binding/react-native/test-app/PorcupineTestApp/ios/PorcupineTestApp.xcodeproj/project.pbxproj +++ b/binding/react-native/test-app/PorcupineTestApp/ios/PorcupineTestApp.xcodeproj/project.pbxproj @@ -576,6 +576,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -602,6 +603,10 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; @@ -643,6 +648,10 @@ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -666,6 +675,10 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/binding/react-native/test-app/PorcupineTestApp/package.json b/binding/react-native/test-app/PorcupineTestApp/package.json index ea08ff84b5..898ce8c809 100644 --- a/binding/react-native/test-app/PorcupineTestApp/package.json +++ b/binding/react-native/test-app/PorcupineTestApp/package.json @@ -11,10 +11,10 @@ }, "dependencies": { "@picovoice/porcupine-react-native": "file:../..", - "@picovoice/react-native-voice-processor": "^1.1.0", + "@picovoice/react-native-voice-processor": "^1.2.3", "base-64": "^1.0.0", "react": "18.2.0", - "react-native": "0.71.0", + "react-native": "0.71.18", "react-native-fs": "^2.20.0" }, "devDependencies": { diff --git a/binding/react-native/test-app/PorcupineTestApp/yarn.lock b/binding/react-native/test-app/PorcupineTestApp/yarn.lock index 94999c82df..ae8b912452 100644 --- a/binding/react-native/test-app/PorcupineTestApp/yarn.lock +++ b/binding/react-native/test-app/PorcupineTestApp/yarn.lock @@ -1113,7 +1113,7 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.14.0", "@babel/traverse@^7.20.0", "@babel/traverse@^7.23.2": +"@babel/traverse@^7.20.0", "@babel/traverse@^7.23.2": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== @@ -1512,14 +1512,14 @@ fastq "^1.6.0" "@picovoice/porcupine-react-native@file:../..": - version "3.0.2" + version "3.0.3" -"@picovoice/react-native-voice-processor@^1.1.0": - version "1.2.0" - 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/react-native-voice-processor@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.3.tgz#f07a2b526922bba1c2b542bbcd842897aab4c241" + integrity sha512-GFnuKXWIOrDTPumcFkwfGaGUt2X1Vq31cU0sM4CZ9o/SomZQxJml12nr8d4uxjG03Z/eouWGN/0AcxZPdqihlw== -"@react-native-community/cli-clean@^10.0.0": +"@react-native-community/cli-clean@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-10.1.1.tgz#4c73ce93a63a24d70c0089d4025daac8184ff504" integrity sha512-iNsrjzjIRv9yb5y309SWJ8NDHdwYtnCpmxZouQDyOljUdC9MwdZ4ChbtA4rwQyAwgOVfS9F/j56ML3Cslmvrxg== @@ -1529,7 +1529,7 @@ execa "^1.0.0" prompts "^2.4.0" -"@react-native-community/cli-config@^10.0.0", "@react-native-community/cli-config@^10.1.1": +"@react-native-community/cli-config@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-10.1.1.tgz#08dcc5d7ca1915647dc06507ed853fe0c1488395" integrity sha512-p4mHrjC+s/ayiNVG6T35GdEGdP6TuyBUg5plVGRJfTl8WT6LBfLYLk+fz/iETrEZ/YkhQIsQcEUQC47MqLNHog== @@ -1548,10 +1548,10 @@ dependencies: serve-static "^1.13.1" -"@react-native-community/cli-doctor@^10.0.0": - version "10.2.5" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.5.tgz#e5e28c66c2373f05a94b296a8ec637f8df736707" - integrity sha512-1YbzXvsldBmSw1MmBsXB74bKiHXKNCjlb2ByLgkfTiarpSvETYam3g5vex0N+qc0Cdkzkq+8NznE744LFhnUpw== +"@react-native-community/cli-doctor@^10.2.7": + version "10.2.7" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.7.tgz#1a3ecd18a7b1e685864c9dc95e014a5f8f225f84" + integrity sha512-MejE7m+63DxfKwFSvyZGfq+72jX0RSP9SdSmDbW0Bjz2NIEE3BsE8rNay+ByFbdSLsapRPvaZv2Jof+dK2Y/yg== dependencies: "@react-native-community/cli-config" "^10.1.1" "@react-native-community/cli-platform-ios" "^10.2.5" @@ -1561,7 +1561,6 @@ envinfo "^7.7.2" execa "^1.0.0" hermes-profile-transformer "^0.0.6" - ip "^1.1.5" node-stream-zip "^1.9.1" ora "^5.4.1" prompts "^2.4.0" @@ -1570,29 +1569,17 @@ sudo-prompt "^9.0.0" wcwidth "^1.0.1" -"@react-native-community/cli-hermes@^10.0.0": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-10.2.0.tgz#cc252f435b149f74260bc918ce22fdf58033a87e" - integrity sha512-urfmvNeR8IiO/Sd92UU3xPO+/qI2lwCWQnxOkWaU/i2EITFekE47MD6MZrfVulRVYRi5cuaFqKZO/ccOdOB/vQ== +"@react-native-community/cli-hermes@^10.2.7": + version "10.2.7" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-10.2.7.tgz#bcb28dfe551562a68d13c787550319f9831576b4" + integrity sha512-MULfkgeLx1fietx10pLFLmlfRh0dcfX/HABXB5Tm0BzQDXy7ofFIJ/UxH+IF55NwPKXl6aEpTbPwbgsyJxqPiA== dependencies: "@react-native-community/cli-platform-android" "^10.2.0" "@react-native-community/cli-tools" "^10.1.1" chalk "^4.1.2" hermes-profile-transformer "^0.0.6" - ip "^1.1.5" -"@react-native-community/cli-platform-android@10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-10.0.0.tgz#9894a0b54de94da4d01f3b9db4e6b51ba112fa72" - integrity sha512-wUXq+//PagXVjG6ZedO+zIbNPkCsAiP+uiE45llFTsCtI6vFBwa6oJFHH6fhfeib4mOd7DvIh2Kktrpgyb6nBg== - dependencies: - "@react-native-community/cli-tools" "^10.0.0" - chalk "^4.1.2" - execa "^1.0.0" - glob "^7.1.3" - logkitty "^0.7.1" - -"@react-native-community/cli-platform-android@^10.2.0": +"@react-native-community/cli-platform-android@10.2.0", "@react-native-community/cli-platform-android@^10.2.0": version "10.2.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-10.2.0.tgz#0bc689270a5f1d9aaf9e723181d43ca4dbfffdef" integrity sha512-CBenYwGxwFdObZTn1lgxWtMGA5ms2G/ALQhkS+XTAD7KHDrCxFF9yT/fnAjFZKM6vX/1TqGI1RflruXih3kAhw== @@ -1603,18 +1590,7 @@ glob "^7.1.3" logkitty "^0.7.1" -"@react-native-community/cli-platform-ios@10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.0.0.tgz#91ee301620e509b44db5fd7c93eaf7ee992d097a" - integrity sha512-WLpXzZQ53zb1RhkpSDNHyBR3SIN3WObDRTEaR0TMXsXDeTj8/Eu2DPFpT+uEnD10ly/Y6/DqJsAt4Ku2X76klA== - dependencies: - "@react-native-community/cli-tools" "^10.0.0" - chalk "^4.1.2" - execa "^1.0.0" - glob "^7.1.3" - ora "^5.4.1" - -"@react-native-community/cli-platform-ios@^10.2.5": +"@react-native-community/cli-platform-ios@10.2.5", "@react-native-community/cli-platform-ios@^10.2.5": version "10.2.5" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.5.tgz#7888c74b83099885bf9e6d52170c6e663ad971ee" integrity sha512-hq+FZZuSBK9z82GLQfzdNDl8vbFx5UlwCLFCuTtNCROgBoapFtVZQKRP2QBftYNrQZ0dLAb01gkwxagHsQCFyg== @@ -1626,7 +1602,7 @@ glob "^7.1.3" ora "^5.4.1" -"@react-native-community/cli-plugin-metro@^10.0.0": +"@react-native-community/cli-plugin-metro@^10.2.3": version "10.2.3" resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.3.tgz#419e0155a50951c3329818fba51cb5021a7294f1" integrity sha512-jHi2oDuTePmW4NEyVT8JEGNlIYcnFXCSV2ZMp4rnDrUk4TzzyvS3IMvDlESEmG8Kry8rvP0KSUx/hTpy37Sbkw== @@ -1643,7 +1619,7 @@ metro-runtime "0.73.10" readline "^1.3.0" -"@react-native-community/cli-server-api@^10.0.0", "@react-native-community/cli-server-api@^10.1.1": +"@react-native-community/cli-server-api@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-10.1.1.tgz#e382269de281bb380c2e685431364fbbb8c1cb3a" integrity sha512-NZDo/wh4zlm8as31UEBno2bui8+ufzsZV+KN7QjEJWEM0levzBtxaD+4je0OpfhRIIkhaRm2gl/vVf7OYAzg4g== @@ -1658,7 +1634,7 @@ serve-static "^1.13.1" ws "^7.5.1" -"@react-native-community/cli-tools@^10.0.0", "@react-native-community/cli-tools@^10.1.1": +"@react-native-community/cli-tools@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-10.1.1.tgz#fa66e509c0d3faa31f7bb87ed7d42ad63f368ddd" integrity sha512-+FlwOnZBV+ailEzXjcD8afY2ogFEBeHOw/8+XXzMgPaquU2Zly9B+8W089tnnohO3yfiQiZqkQlElP423MY74g== @@ -1680,19 +1656,19 @@ dependencies: joi "^17.2.1" -"@react-native-community/cli@10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.0.0.tgz#46f68a1184014956dc237e12e6c2ca9b318a04db" - integrity sha512-KHV9/AbPeIK87jHP7iY07/HQG00J5AYF/dHz2rzqAZGB2WYFAbc5uoLRw90u/U2AcSeO7ep+4kawm+/B9LJreg== +"@react-native-community/cli@10.2.7": + version "10.2.7" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.7.tgz#013c47827d138bcc5ac64fb5c5e792ff3350a0e8" + integrity sha512-31GrAP5PjHosXV5bkHWVnYGjAeka2gkTTsPqasJAki5RI1njB1a2WAkYFV0sn+gqc4RU1s96RELBBfT+EGzhAQ== dependencies: - "@react-native-community/cli-clean" "^10.0.0" - "@react-native-community/cli-config" "^10.0.0" + "@react-native-community/cli-clean" "^10.1.1" + "@react-native-community/cli-config" "^10.1.1" "@react-native-community/cli-debugger-ui" "^10.0.0" - "@react-native-community/cli-doctor" "^10.0.0" - "@react-native-community/cli-hermes" "^10.0.0" - "@react-native-community/cli-plugin-metro" "^10.0.0" - "@react-native-community/cli-server-api" "^10.0.0" - "@react-native-community/cli-tools" "^10.0.0" + "@react-native-community/cli-doctor" "^10.2.7" + "@react-native-community/cli-hermes" "^10.2.7" + "@react-native-community/cli-plugin-metro" "^10.2.3" + "@react-native-community/cli-server-api" "^10.1.1" + "@react-native-community/cli-tools" "^10.1.1" "@react-native-community/cli-types" "^10.0.0" chalk "^4.1.2" commander "^9.4.1" @@ -3909,11 +3885,6 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^1.1.5: - version "1.1.9" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" - integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== - is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -4676,10 +4647,10 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsc-android@^250230.2.1: - version "250230.2.1" - resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250230.2.1.tgz#3790313a970586a03ab0ad47defbc84df54f1b83" - integrity sha512-KmxeBlRjwoqCnBBKGsihFtvsBHyUFlBxJPK4FzeYcIuBfdjv6jFys44JITAgSTbQD+vIdwMEfyZklsuQX0yI1Q== +jsc-android@^250231.0.0: + version "250231.0.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250231.0.0.tgz#91720f8df382a108872fa4b3f558f33ba5e95262" + integrity sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw== jsc-safe-url@^0.2.2: version "0.2.4" @@ -4957,16 +4928,6 @@ metro-babel-transformer@0.73.10: metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-babel-transformer@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.5.tgz#e7ebe371cd8bf5df90b0e9153587b4d5089d2ce7" - integrity sha512-G3awAJ9of/R2jEg+MRokYcq/TNvMSxJipwybQ2NfwwSj5iLEmRH2YbwTx5w8f5qKgs2K4SS2pmBIs8qjdV6p3Q== - dependencies: - "@babel/core" "^7.14.0" - hermes-parser "0.8.0" - metro-source-map "0.73.5" - nullthrows "^1.1.1" - metro-cache-key@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.73.10.tgz#8d63591187d295b62a80aed64a87864b1e9d67a2" @@ -5151,19 +5112,6 @@ metro-react-native-babel-transformer@0.73.10: metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-react-native-babel-transformer@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.5.tgz#fb1d48cc73ce26371cf2a115f702b7bf3bb5516b" - integrity sha512-CZYgUguqFTzV9vSOZb60p8qlp31aWz8aBB6OqoZ2gJday+n/1k+Y0yy6VPr/tfXJheuQYVIXKvG1gMmUDyxt+Q== - dependencies: - "@babel/core" "^7.14.0" - babel-preset-fbjs "^3.4.0" - hermes-parser "0.8.0" - metro-babel-transformer "0.73.5" - metro-react-native-babel-preset "0.73.5" - metro-source-map "0.73.5" - nullthrows "^1.1.1" - metro-resolver@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.10.tgz#c39a3bd8d33e5d78cb256110d29707d8d49ed0be" @@ -5179,14 +5127,6 @@ metro-runtime@0.73.10: "@babel/runtime" "^7.0.0" react-refresh "^0.4.0" -metro-runtime@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.5.tgz#8c92c3947e97a8dede6347ba6a9844bfb8be8258" - integrity sha512-8QJOS7bhJmR6r/Gkki/qY9oX/DdxnLhS8FpdG1Xmm2hDeUVAug12ekWTiCRMu7d1CDVv1F8WvUz09QckZ0dO0g== - dependencies: - "@babel/runtime" "^7.0.0" - react-refresh "^0.4.0" - metro-source-map@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.10.tgz#28e09a28f1a2f7a4f8d0845b845cbed74e2f48f9" @@ -5201,20 +5141,6 @@ metro-source-map@0.73.10: source-map "^0.5.6" vlq "^1.0.0" -metro-source-map@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.5.tgz#67e14bd1fcc1074b9623640ca311cd99d07426fa" - integrity sha512-58p3zNWgUrqYYjFJb0KkZ+uJurTL4oz7i5T7577b3kvTYuJ0eK4y7rtYf8EwOfMYxRAn/m20aH1Y1fHTsLUwjQ== - dependencies: - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.20.0" - invariant "^2.2.4" - metro-symbolicate "0.73.5" - nullthrows "^1.1.1" - ob1 "0.73.5" - source-map "^0.5.6" - vlq "^1.0.0" - metro-symbolicate@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.10.tgz#7853a9a8fbfd615a5c9db698fffc685441ac880f" @@ -5227,18 +5153,6 @@ metro-symbolicate@0.73.10: through2 "^2.0.1" vlq "^1.0.0" -metro-symbolicate@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.5.tgz#8de118be231decd55c8c70ed54deb308fdffceda" - integrity sha512-aIC8sDlaEdtn0dTt+64IFZFEATatFx3GtzRbJi0+jJx47RjDRiuCt9fzmTMLuadWwnbFK9ZfVMuWEXM9sdtQ7w== - dependencies: - invariant "^2.2.4" - metro-source-map "0.73.5" - nullthrows "^1.1.1" - source-map "^0.5.6" - through2 "^2.0.1" - vlq "^1.0.0" - metro-transform-plugins@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.73.10.tgz#1b762330cbbedb6c18438edc3d76b063c88882af" @@ -5541,11 +5455,6 @@ ob1@0.73.10: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.10.tgz#bf0a2e8922bb8687ddca82327c5cf209414a1bd4" integrity sha512-aO6EYC+QRRCkZxVJhCWhLKgVjhNuD6Gu1riGjxrIm89CqLsmKgxzYDDEsktmKsoDeRdWGQM5EdMzXDl5xcVfsw== -ob1@0.73.5: - version "0.73.5" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.5.tgz#b80dc4a6f787044e3d8afde3c2d034ae23d05a86" - integrity sha512-MxQH/rCq9/COvgTQbjCldArmesGEidZVVQIn4vDUJvJJ8uMphXOTCBsgWTief2ugvb0WUimIaslKSA+qryFjjQ== - object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -5957,7 +5866,7 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-native-codegen@^0.71.3: +react-native-codegen@^0.71.6: version "0.71.6" resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.71.6.tgz#481a610c3af9135b09e1e031da032e7270e0cc1b" integrity sha512-e5pR4VldIhEaFctfSAEgxbng0uG4gjBQxAHes3EKLdosH/Av90pQfSe9IDVdFIngvNPzt8Y14pNjrtqov/yNIg== @@ -5975,42 +5884,43 @@ react-native-fs@^2.20.0: base-64 "^0.1.0" utf8 "^3.0.0" -react-native-gradle-plugin@^0.71.12: +react-native-gradle-plugin@^0.71.19: version "0.71.19" resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.19.tgz#3379e28341fcd189bc1f4691cefc84c1a4d7d232" integrity sha512-1dVk9NwhoyKHCSxcrM6vY6cxmojeATsBobDicX0ZKr7DgUF2cBQRTKsimQFvzH8XhOVXyH8p4HyDSZNIFI8OlQ== -react-native@0.71.0: - version "0.71.0" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.0.tgz#ce47c3cb6239484fcd686d1f45b363b7014b6c62" - integrity sha512-b5oCS/cPVqXT5E2K+0CfQMERAoRu6/6g1no9XRAcjQ4b5JG608WgDh5QgXPHaMSVhAvsJ1DuRoU8C/xqTjQITA== +react-native@0.71.18: + version "0.71.18" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.18.tgz#9de968ef66f2e32a72ab0bf3862757d5949fcd39" + integrity sha512-eWQZATriDSEHxlJFugXMxH0Z/inM1e8JwsyNIUEUj31a3oCJDA75hUy6/9oBJ5hRxjJbzpZu7+3Tq24NJk6sLQ== dependencies: "@jest/create-cache-key-function" "^29.2.1" - "@react-native-community/cli" "10.0.0" - "@react-native-community/cli-platform-android" "10.0.0" - "@react-native-community/cli-platform-ios" "10.0.0" + "@react-native-community/cli" "10.2.7" + "@react-native-community/cli-platform-android" "10.2.0" + "@react-native-community/cli-platform-ios" "10.2.5" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "2.1.0" "@react-native/polyfills" "2.0.0" abort-controller "^3.0.0" anser "^1.4.9" + ansi-regex "^5.0.0" base64-js "^1.1.2" deprecated-react-native-prop-types "^3.0.1" event-target-shim "^5.0.1" invariant "^2.2.4" jest-environment-node "^29.2.1" - jsc-android "^250230.2.1" + jsc-android "^250231.0.0" memoize-one "^5.0.0" - metro-react-native-babel-transformer "0.73.5" - metro-runtime "0.73.5" - metro-source-map "0.73.5" + metro-react-native-babel-transformer "0.73.10" + metro-runtime "0.73.10" + metro-source-map "0.73.10" mkdirp "^0.5.1" nullthrows "^1.1.1" pretty-format "^26.5.2" promise "^8.3.0" react-devtools-core "^4.26.1" - react-native-codegen "^0.71.3" - react-native-gradle-plugin "^0.71.12" + react-native-codegen "^0.71.6" + react-native-gradle-plugin "^0.71.19" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" regenerator-runtime "^0.13.2" diff --git a/binding/react-native/yarn.lock b/binding/react-native/yarn.lock index 6473cc759e..dde530ace2 100644 --- a/binding/react-native/yarn.lock +++ b/binding/react-native/yarn.lock @@ -1503,10 +1503,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@picovoice/react-native-voice-processor@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.2.tgz#dac86c918a3f299d859a3988fe25f98faa5d13a2" - integrity sha512-l3pQWNfPI7lJiVnMhyjQx9WoF1QhvsBNf9pEIVcEGipHrfdW1HTZ3RPRRHfZLUSPiIGHrQf1R/tMshQPZmkY3w== +"@picovoice/react-native-voice-processor@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.3.tgz#f07a2b526922bba1c2b542bbcd842897aab4c241" + integrity sha512-GFnuKXWIOrDTPumcFkwfGaGUt2X1Vq31cU0sM4CZ9o/SomZQxJml12nr8d4uxjG03Z/eouWGN/0AcxZPdqihlw== "@react-native-community/cli-debugger-ui@^7.0.3": version "7.0.3" diff --git a/demo/flutter/ios/Podfile.lock b/demo/flutter/ios/Podfile.lock index 77235772ee..3ebe74d5ec 100644 --- a/demo/flutter/ios/Podfile.lock +++ b/demo/flutter/ios/Podfile.lock @@ -1,18 +1,18 @@ PODS: - Flutter (1.0.0) - - flutter_voice_processor (1.1.0): + - flutter_voice_processor (1.1.2): - Flutter - - ios-voice-processor (~> 1.1.0) + - ios-voice-processor (~> 1.2.0) - integration_test (0.0.1): - Flutter - - ios-voice-processor (1.1.0) + - ios-voice-processor (1.2.0) - path_provider_ios (0.0.1): - Flutter - - Porcupine-iOS (3.0.1): - - ios-voice-processor (~> 1.1.0) - - porcupine_flutter (3.0.1): + - Porcupine-iOS (3.0.4): + - ios-voice-processor (~> 1.2.0) + - porcupine_flutter (3.0.4): - Flutter - - Porcupine-iOS (~> 3.0.1) + - Porcupine-iOS (~> 3.0.4) DEPENDENCIES: - Flutter (from `Flutter`) @@ -39,13 +39,13 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/porcupine_flutter/ios" SPEC CHECKSUMS: - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - flutter_voice_processor: 53afbf59ad3feb82f4a379fea9ed8dc98495210f - integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 - ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + flutter_voice_processor: 9ebe2cae6612db22d20e7e7833937ea19fa3e59c + integration_test: 13825b8a9334a850581300559b8839134b124670 + ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97 path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - Porcupine-iOS: 6d69509fa587f3ac0be1adfefb48e0c6ce029fff - porcupine_flutter: 34411d7cd1e2bff5ff518e1f91b763a2e742e021 + Porcupine-iOS: da103a8848ce6b36acd4a5e42bb811d4532dd515 + porcupine_flutter: f903f397e6ea55a5c627432b0cdfcad84b68fbd1 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b diff --git a/demo/flutter/ios/Runner.xcodeproj/project.pbxproj b/demo/flutter/ios/Runner.xcodeproj/project.pbxproj index e170e30c69..fef7ee58d2 100644 --- a/demo/flutter/ios/Runner.xcodeproj/project.pbxproj +++ b/demo/flutter/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -199,10 +199,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -252,6 +254,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/demo/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/demo/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a335..a6b826db27 100644 --- a/demo/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/demo/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/demo/flutter/pubspec.lock b/demo/flutter/pubspec.lock index 3601a6c589..e612ee09d3 100644 --- a/demo/flutter/pubspec.lock +++ b/demo/flutter/pubspec.lock @@ -17,6 +17,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + bottom_picker: + dependency: "direct main" + description: + name: bottom_picker + sha256: "7c690407c6c489bc7c556858c3f1b804aac73c3a128559f328cc829ba12983ad" + url: "https://pub.dev" + source: hosted + version: "2.8.0" characters: dependency: transitive description: @@ -75,14 +83,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_picker: - dependency: "direct main" - description: - name: flutter_picker - sha256: "2f94c6eefba8697b07e3cd008b75f06b4ba7053cb26d23ae0fcd5932b7dc75af" - url: "https://pub.dev" - source: hosted - version: "2.1.0" flutter_test: dependency: "direct dev" description: flutter @@ -92,10 +92,10 @@ packages: dependency: transitive description: name: flutter_voice_processor - sha256: "3c91d8ab34b33016643ae7586a305b81c47c1b66a95b489807c34f127537fcbc" + sha256: "8ae3fc196d6060a13392e4ca557f7a2f4a6b87898ae519787f6929f986538572" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -222,10 +222,10 @@ packages: dependency: "direct main" description: name: porcupine_flutter - sha256: "33849262a3009d6eca653b529916baf8b1dd6d62468fa00fbc17366d6dff8672" + sha256: "12d81f0337d85cf8d3d2f1a2ade0613b14cebc44808acea249c99113528e66c5" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" process: dependency: transitive description: @@ -345,4 +345,4 @@ packages: version: "0.2.0+3" sdks: dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=2.8.1" + flutter: ">=3.3.0" diff --git a/demo/flutter/pubspec.yaml b/demo/flutter/pubspec.yaml index 569c67d920..7dc5f08d14 100644 --- a/demo/flutter/pubspec.yaml +++ b/demo/flutter/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: sdk: flutter bottom_picker: ^2.7.0 - porcupine_flutter: ^3.0.3 + porcupine_flutter: ^3.0.4 path: ^1.8.0 dev_dependencies: diff --git a/demo/ios/BackgroundService/Podfile b/demo/ios/BackgroundService/Podfile index 921924cf23..a93a2c4c26 100644 --- a/demo/ios/BackgroundService/Podfile +++ b/demo/ios/BackgroundService/Podfile @@ -2,6 +2,6 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'PorcupineBackgroundServiceDemo' do - pod 'Porcupine-iOS', '~> 3.0.2' + pod 'Porcupine-iOS', '~> 3.0.4' pod 'SwiftySound' end diff --git a/demo/ios/BackgroundService/Podfile.lock b/demo/ios/BackgroundService/Podfile.lock index 514f48a380..18dacc3b50 100644 --- a/demo/ios/BackgroundService/Podfile.lock +++ b/demo/ios/BackgroundService/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - ios-voice-processor (1.1.1) - - Porcupine-iOS (3.0.2): - - ios-voice-processor (~> 1.1.1) + - ios-voice-processor (1.2.0) + - Porcupine-iOS (3.0.4): + - ios-voice-processor (~> 1.2.0) - SwiftySound (1.3.0) DEPENDENCIES: - - Porcupine-iOS (~> 3.0.2) + - Porcupine-iOS (~> 3.0.4) - SwiftySound SPEC REPOS: @@ -15,10 +15,10 @@ SPEC REPOS: - SwiftySound SPEC CHECKSUMS: - ios-voice-processor: 4035132542c7ae07f1e459c6d276b6da000302bb - Porcupine-iOS: b8408a28fe3df81ea8d8f3cf1e5a04823ffb71d3 + ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97 + Porcupine-iOS: da103a8848ce6b36acd4a5e42bb811d4532dd515 SwiftySound: b6d7355bc15f5eef1a52695ad40e9ac5597d907b -PODFILE CHECKSUM: fe9f74fb8c7d7929fb05201fb255db81d7e59a57 +PODFILE CHECKSUM: 52dd00cfd0c3fdac34ed2b7b3294c3cc75032502 COCOAPODS: 1.11.3 diff --git a/demo/ios/BackgroundService/PorcupineBackgroundServiceDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/demo/ios/BackgroundService/PorcupineBackgroundServiceDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d..0000000000 --- a/demo/ios/BackgroundService/PorcupineBackgroundServiceDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/demo/ios/ForegroundApp/Podfile b/demo/ios/ForegroundApp/Podfile deleted file mode 100644 index c28ce3e314..0000000000 --- a/demo/ios/ForegroundApp/Podfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://cdn.cocoapods.org/' -platform :ios, '13.0' - -target 'PorcupineForegroundAppDemo' do - pod 'Porcupine-iOS', '~> 3.0.2' -end diff --git a/demo/ios/ForegroundApp/Podfile.lock b/demo/ios/ForegroundApp/Podfile.lock deleted file mode 100644 index a0483be3e5..0000000000 --- a/demo/ios/ForegroundApp/Podfile.lock +++ /dev/null @@ -1,20 +0,0 @@ -PODS: - - ios-voice-processor (1.1.1) - - Porcupine-iOS (3.0.2): - - ios-voice-processor (~> 1.1.1) - -DEPENDENCIES: - - Porcupine-iOS (~> 3.0.2) - -SPEC REPOS: - trunk: - - ios-voice-processor - - Porcupine-iOS - -SPEC CHECKSUMS: - ios-voice-processor: 4035132542c7ae07f1e459c6d276b6da000302bb - Porcupine-iOS: b8408a28fe3df81ea8d8f3cf1e5a04823ffb71d3 - -PODFILE CHECKSUM: 43464d265b541463337c28e4117db641795044c5 - -COCOAPODS: 1.11.3 diff --git a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcodeproj/project.pbxproj b/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcodeproj/project.pbxproj index c6efbe78ca..1a5cf3d599 100644 --- a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcodeproj/project.pbxproj +++ b/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcodeproj/project.pbxproj @@ -3,14 +3,34 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ 02A026312A05805F005CA1BA /* pre-build.sh in Resources */ = {isa = PBXBuildFile; fileRef = 02C2CC812A0327E800EF9DEA /* pre-build.sh */; }; 02C2CC7E2A03205E00EF9DEA /* keywords in Resources */ = {isa = PBXBuildFile; fileRef = 02C2CC7D2A03205E00EF9DEA /* keywords */; }; 02C2CC802A03206800EF9DEA /* models in Resources */ = {isa = PBXBuildFile; fileRef = 02C2CC7F2A03206800EF9DEA /* models */; }; - 98C07FAE08204ECF35C62683 /* libPods-PorcupineForegroundAppDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E42DB18835CE685BCEE511C /* libPods-PorcupineForegroundAppDemo.a */; }; + 02C704FC2CCAE6EB0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C704FB2CCAE6EB0002B3E4 /* Porcupine */; }; + 02C7050F2CCAF9A70002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7050E2CCAF9A70002B3E4 /* Porcupine */; }; + 02C705122CCAFA990002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705112CCAFA990002B3E4 /* Porcupine */; }; + 02C705152CCAFF340002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705142CCAFF340002B3E4 /* Porcupine */; }; + 02C705182CCAFF610002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705172CCAFF610002B3E4 /* Porcupine */; }; + 02C7051B2CCB01FA0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7051A2CCB01FA0002B3E4 /* Porcupine */; }; + 02C7051E2CCB029F0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7051D2CCB029F0002B3E4 /* Porcupine */; }; + 02C705212CCB03990002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705202CCB03990002B3E4 /* Porcupine */; }; + 02C705242CCB06390002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705232CCB06390002B3E4 /* Porcupine */; }; + 02C705272CCB09D30002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705262CCB09D30002B3E4 /* Porcupine */; }; + 02C7052A2CCB0A0A0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705292CCB0A0A0002B3E4 /* Porcupine */; }; + 02C7052D2CCB0B260002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7052C2CCB0B260002B3E4 /* Porcupine */; }; + 02C705302CCB0BC90002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7052F2CCB0BC90002B3E4 /* Porcupine */; }; + 02C705332CCB0E810002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705322CCB0E810002B3E4 /* Porcupine */; }; + 02C705362CCB0F630002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705352CCB0F630002B3E4 /* Porcupine */; }; + 02C705392CCB100C0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705382CCB100C0002B3E4 /* Porcupine */; }; + 02C7053C2CCB106A0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7053B2CCB106A0002B3E4 /* Porcupine */; }; + 02C7053F2CCB11200002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C7053E2CCB11200002B3E4 /* Porcupine */; }; + 02C705422CCB12060002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705412CCB12060002B3E4 /* Porcupine */; }; + 02C705452CCB128C0002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705442CCB128C0002B3E4 /* Porcupine */; }; + 02C705482CCB13610002B3E4 /* Porcupine in Frameworks */ = {isa = PBXBuildFile; productRef = 02C705472CCB13610002B3E4 /* Porcupine */; }; BBE66BCE205DD6F7006005B1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE66BCD205DD6F7006005B1 /* AppDelegate.swift */; }; BBE66BD0205DD6F7006005B1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE66BCF205DD6F7006005B1 /* ViewController.swift */; }; BBE66BD3205DD6F7006005B1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BBE66BD1205DD6F7006005B1 /* Main.storyboard */; }; @@ -36,8 +56,6 @@ 02C2CC7D2A03205E00EF9DEA /* keywords */ = {isa = PBXFileReference; lastKnownFileType = folder; path = keywords; sourceTree = ""; }; 02C2CC7F2A03206800EF9DEA /* models */ = {isa = PBXFileReference; lastKnownFileType = folder; path = models; sourceTree = ""; }; 02C2CC812A0327E800EF9DEA /* pre-build.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "pre-build.sh"; sourceTree = ""; }; - 1E42DB18835CE685BCEE511C /* libPods-PorcupineForegroundAppDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PorcupineForegroundAppDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3CC3815B148D5148AA1A5964 /* Pods-PorcupineForegroundAppDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineForegroundAppDemo.debug.xcconfig"; path = "Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo.debug.xcconfig"; sourceTree = ""; }; BBE66BCA205DD6F7006005B1 /* PorcupineForegroundAppDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PorcupineForegroundAppDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; BBE66BCD205DD6F7006005B1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; BBE66BCF205DD6F7006005B1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -45,7 +63,6 @@ BBE66BD4205DD6F7006005B1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; BBE66BD7205DD6F7006005B1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; BBE66BD9205DD6F7006005B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D7CC279F4C61B173D8697030 /* Pods-PorcupineForegroundAppDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PorcupineForegroundAppDemo.release.xcconfig"; path = "Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -53,27 +70,37 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 98C07FAE08204ECF35C62683 /* libPods-PorcupineForegroundAppDemo.a in Frameworks */, + 02C7053C2CCB106A0002B3E4 /* Porcupine in Frameworks */, + 02C7051B2CCB01FA0002B3E4 /* Porcupine in Frameworks */, + 02C705422CCB12060002B3E4 /* Porcupine in Frameworks */, + 02C7051E2CCB029F0002B3E4 /* Porcupine in Frameworks */, + 02C705122CCAFA990002B3E4 /* Porcupine in Frameworks */, + 02C705242CCB06390002B3E4 /* Porcupine in Frameworks */, + 02C705452CCB128C0002B3E4 /* Porcupine in Frameworks */, + 02C705182CCAFF610002B3E4 /* Porcupine in Frameworks */, + 02C7050F2CCAF9A70002B3E4 /* Porcupine in Frameworks */, + 02C705362CCB0F630002B3E4 /* Porcupine in Frameworks */, + 02C7052D2CCB0B260002B3E4 /* Porcupine in Frameworks */, + 02C705272CCB09D30002B3E4 /* Porcupine in Frameworks */, + 02C705332CCB0E810002B3E4 /* Porcupine in Frameworks */, + 02C7052A2CCB0A0A0002B3E4 /* Porcupine in Frameworks */, + 02C7053F2CCB11200002B3E4 /* Porcupine in Frameworks */, + 02C705482CCB13610002B3E4 /* Porcupine in Frameworks */, + 02C705302CCB0BC90002B3E4 /* Porcupine in Frameworks */, + 02C705152CCAFF340002B3E4 /* Porcupine in Frameworks */, + 02C705212CCB03990002B3E4 /* Porcupine in Frameworks */, + 02C705392CCB100C0002B3E4 /* Porcupine in Frameworks */, + 02C704FC2CCAE6EB0002B3E4 /* Porcupine in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2BBD9051A599A3751D329DE8 /* Pods */ = { - isa = PBXGroup; - children = ( - 3CC3815B148D5148AA1A5964 /* Pods-PorcupineForegroundAppDemo.debug.xcconfig */, - D7CC279F4C61B173D8697030 /* Pods-PorcupineForegroundAppDemo.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; BB65C7B0205F4BF400E8770E /* Frameworks */ = { isa = PBXGroup; children = ( 026A05172693CF2C005C4511 /* libPorcupine-iOS.a */, - 1E42DB18835CE685BCEE511C /* libPods-PorcupineForegroundAppDemo.a */, ); name = Frameworks; sourceTree = ""; @@ -85,7 +112,6 @@ BBE66BCC205DD6F7006005B1 /* PorcupineForegroundAppDemo */, BBE66BCB205DD6F7006005B1 /* Products */, BB65C7B0205F4BF400E8770E /* Frameworks */, - 2BBD9051A599A3751D329DE8 /* Pods */, ); sourceTree = ""; }; @@ -119,13 +145,10 @@ isa = PBXNativeTarget; buildConfigurationList = BBE66BE7205DD6F7006005B1 /* Build configuration list for PBXNativeTarget "PorcupineForegroundAppDemo" */; buildPhases = ( - 6C1AA9585BD75DCCFB45F279 /* [CP] Check Pods Manifest.lock */, BBE66BC6205DD6F7006005B1 /* Sources */, BBE66BC7205DD6F7006005B1 /* Frameworks */, BBE66BC8205DD6F7006005B1 /* Resources */, 02FB765E25CA0965004826D5 /* Embed Frameworks */, - B77D33C02C8A1E8363018033 /* [CP] Embed Pods Frameworks */, - 6D664CD7224F9EF799677397 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -167,6 +190,9 @@ Base, ); mainGroup = BBE66BC1205DD6F7006005B1; + packageReferences = ( + 02C705462CCB13610002B3E4 /* XCLocalSwiftPackageReference "../../../../porcupine" */, + ); productRefGroup = BBE66BCB205DD6F7006005B1 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -192,67 +218,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 6C1AA9585BD75DCCFB45F279 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PorcupineForegroundAppDemo-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 6D664CD7224F9EF799677397 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/Porcupine-iOS/PorcupineResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/PorcupineResources.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - B77D33C02C8A1E8363018033 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Porcupine-iOS/PvPorcupine.framework/PvPorcupine", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PvPorcupine.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PorcupineForegroundAppDemo/Pods-PorcupineForegroundAppDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ BBE66BC6205DD6F7006005B1 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -396,15 +361,15 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_INCLUDE_PATHS = "${SRCROOT}"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; }; BBE66BE8205DD6F7006005B1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3CC3815B148D5148AA1A5964 /* Pods-PorcupineForegroundAppDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -412,7 +377,10 @@ DEVELOPMENT_TEAM = 65723695GD; INFOPLIST_FILE = "$(SRCROOT)/PorcupineForegroundAppDemo/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ai.picovoice.PorcupineForegroundAppDemo; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -423,7 +391,6 @@ }; BBE66BE9205DD6F7006005B1 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D7CC279F4C61B173D8697030 /* Pods-PorcupineForegroundAppDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -431,7 +398,10 @@ DEVELOPMENT_TEAM = 65723695GD; INFOPLIST_FILE = "$(SRCROOT)/PorcupineForegroundAppDemo/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ai.picovoice.PorcupineForegroundAppDemo; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -462,6 +432,175 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 02C705462CCB13610002B3E4 /* XCLocalSwiftPackageReference "../../../../porcupine" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../../../porcupine; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 02C704FA2CCAE6EB0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 9eea419d20896cd8aecbcee64757d4b9a27d7629; + }; + }; + 02C705102CCAFA990002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 6fcbaf09092605204727dd169c8ecdfca877795b; + }; + }; + 02C705132CCAFF340002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = dada11b93c2bc496109854890126a6661ccbe271; + }; + }; + 02C7051C2CCB029F0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 7999128c4f34c358c8e46c28882f5208ddee97a9; + }; + }; + 02C7051F2CCB03990002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 29612a4a194d0a113357a0fb97b95ea6ca4c47c9; + }; + }; + 02C705222CCB06390002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 2e7a339e3e17da337dee86949d7432810e5f9040; + }; + }; + 02C705402CCB12060002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 90fb6b91266c68ed26d4fa0ba7eb67195c362cc9; + }; + }; + 02C705432CCB128C0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Picovoice/porcupine"; + requirement = { + kind = revision; + revision = 90fb6b91266c68ed26d4fa0ba7eb67195c362cc9; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 02C704FB2CCAE6EB0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C704FA2CCAE6EB0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C7050E2CCAF9A70002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705112CCAFA990002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705102CCAFA990002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705142CCAFF340002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705132CCAFF340002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705172CCAFF610002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7051A2CCB01FA0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7051D2CCB029F0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C7051C2CCB029F0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705202CCB03990002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C7051F2CCB03990002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705232CCB06390002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705222CCB06390002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705262CCB09D30002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705292CCB0A0A0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7052C2CCB0B260002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7052F2CCB0BC90002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705322CCB0E810002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705352CCB0F630002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705382CCB100C0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7053B2CCB106A0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C7053E2CCB11200002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; + 02C705412CCB12060002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705402CCB12060002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705442CCB128C0002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + package = 02C705432CCB128C0002B3E4 /* XCRemoteSwiftPackageReference "porcupine" */; + productName = Porcupine; + }; + 02C705472CCB13610002B3E4 /* Porcupine */ = { + isa = XCSwiftPackageProductDependency; + productName = Porcupine; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = BBE66BC2205DD6F7006005B1 /* Project object */; } diff --git a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/contents.xcworkspacedata b/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 0f67a6ddfd..0000000000 --- a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d..0000000000 --- a/demo/ios/ForegroundApp/PorcupineForegroundAppDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/demo/react-native/ios/Podfile.lock b/demo/react-native/ios/Podfile.lock index f6c5432368..aa9d77815c 100644 --- a/demo/react-native/ios/Podfile.lock +++ b/demo/react-native/ios/Podfile.lock @@ -11,11 +11,11 @@ PODS: - ReactCommon/turbomodule/core (= 0.68.7) - fmt (6.2.1) - glog (0.3.5) - - ios-voice-processor (1.1.0) - - Porcupine-iOS (3.0.1): - - ios-voice-processor (~> 1.1.0) - - porcupine-react-native (3.0.2): - - Porcupine-iOS (~> 3.0.1) + - ios-voice-processor (1.2.0) + - Porcupine-iOS (3.0.4): + - ios-voice-processor (~> 1.2.0) + - porcupine-react-native (3.0.3): + - Porcupine-iOS (~> 3.0.4) - React - RCT-Folly (2021.06.28.00-v2): - boost @@ -224,8 +224,8 @@ PODS: - React-jsinspector (0.68.7) - React-logger (0.68.7): - glog - - react-native-voice-processor (1.2.2): - - ios-voice-processor (~> 1.1.0) + - react-native-voice-processor (1.2.3): + - ios-voice-processor (~> 1.2.0) - React-Core - React-perflogger (0.68.7) - React-RCTActionSheet (0.68.7): @@ -417,9 +417,9 @@ SPEC CHECKSUMS: FBReactNativeSpec: 1fa200a9862d9369a53b6fddbbfcdc22bab24062 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 476ee3e89abb49e07f822b48323c51c57124b572 - ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 - Porcupine-iOS: 6d69509fa587f3ac0be1adfefb48e0c6ce029fff - porcupine-react-native: 8d7374c0fea2fa6ad645139f33150290a56f574e + ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97 + Porcupine-iOS: da103a8848ce6b36acd4a5e42bb811d4532dd515 + porcupine-react-native: 2d1932ab12e4eb8130c821e8d439c23c8b5318f5 RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCTRequired: 530916cd48c5f7cf1fc16966ad5ea01638ca4799 RCTTypeSafety: 5fb4cb3080efd582e5563c3e9a0e459fc51396c5 @@ -433,7 +433,7 @@ SPEC CHECKSUMS: React-jsiexecutor: 7c0bd030a84f2ec446fb104b7735af2f5ed11eea React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e React-logger: b75b80500ea80457b2cf169427d66de986cdcb29 - react-native-voice-processor: 6f8e5236d1a370be02aa87da8e34aa26506678df + react-native-voice-processor: 47d7906332e258dcd1f2ee089bdb9bf0f6809ccf React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09 React-RCTAnimation: f05da175751867521d14b02ab4d3994a7b96f131 diff --git a/demo/react-native/package.json b/demo/react-native/package.json index bde3e8af55..1c6ffe5e08 100644 --- a/demo/react-native/package.json +++ b/demo/react-native/package.json @@ -1,6 +1,6 @@ { "name": "porcupine-react-native-demo", - "version": "3.0.2", + "version": "3.0.3", "private": true, "scripts": { "start": "react-native start", @@ -15,8 +15,8 @@ "ios-bundle": "node scripts/run_demo.js bundle --dev false --platform ios --entry-file index.js --bundle-output ios/app.jsbundle" }, "dependencies": { - "@picovoice/porcupine-react-native": "3.0.2", - "@picovoice/react-native-voice-processor": "1.2.2", + "@picovoice/porcupine-react-native": "3.0.3", + "@picovoice/react-native-voice-processor": "1.2.3", "@react-native-picker/picker": "^1.9.2", "react": "17.0.2", "react-native": "0.68.7" diff --git a/demo/react-native/yarn.lock b/demo/react-native/yarn.lock index a69642de35..8915c9ddaf 100644 --- a/demo/react-native/yarn.lock +++ b/demo/react-native/yarn.lock @@ -1476,15 +1476,15 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@picovoice/porcupine-react-native@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@picovoice/porcupine-react-native/-/porcupine-react-native-3.0.2.tgz#8eabb16222ad95902a48202b427d669032df2c6a" - integrity sha512-nmvk1aBVPQ45kCdfToq5DhvyQDdkSO9XZjBO/2KRgTs1qNXDfYeo0vZGvQuUWdGpfzgZExYcVcNLfs8k0jB5fg== +"@picovoice/porcupine-react-native@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@picovoice/porcupine-react-native/-/porcupine-react-native-3.0.3.tgz#3e82fcdbd335a7c3b7019562c369ee53754837a3" + integrity sha512-3RM+bErlHy3kjZ/i4d4BL++pwidHiNBdyN0T9ePNBxbW/SilsigYfXedg2jZG9rPbtJgiPsN/uYgVkNz+lDPLg== -"@picovoice/react-native-voice-processor@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.2.tgz#dac86c918a3f299d859a3988fe25f98faa5d13a2" - integrity sha512-l3pQWNfPI7lJiVnMhyjQx9WoF1QhvsBNf9pEIVcEGipHrfdW1HTZ3RPRRHfZLUSPiIGHrQf1R/tMshQPZmkY3w== +"@picovoice/react-native-voice-processor@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.3.tgz#f07a2b526922bba1c2b542bbcd842897aab4c241" + integrity sha512-GFnuKXWIOrDTPumcFkwfGaGUt2X1Vq31cU0sM4CZ9o/SomZQxJml12nr8d4uxjG03Z/eouWGN/0AcxZPdqihlw== "@react-native-community/cli-debugger-ui@^7.0.3": version "7.0.3" diff --git a/lib/ios/PvPorcupine.xcframework/Info.plist b/lib/ios/PvPorcupine.xcframework/Info.plist index 5bd6e1f60b..6059d5ff2c 100644 --- a/lib/ios/PvPorcupine.xcframework/Info.plist +++ b/lib/ios/PvPorcupine.xcframework/Info.plist @@ -5,31 +5,35 @@ AvailableLibraries + BinaryPath + PvPorcupine.framework/PvPorcupine LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath PvPorcupine.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator + BinaryPath + PvPorcupine.framework/PvPorcupine LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath PvPorcupine.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/Info.plist b/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/Info.plist index 68cad3c0fd..41346e6226 100644 Binary files a/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/Info.plist and b/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/Info.plist differ diff --git a/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/PvPorcupine b/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/PvPorcupine index 00bd61c98a..2984b8a42c 100755 Binary files a/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/PvPorcupine and b/lib/ios/PvPorcupine.xcframework/ios-arm64/PvPorcupine.framework/PvPorcupine differ diff --git a/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/Info.plist b/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/Info.plist index 84852722b7..f020af02ca 100644 Binary files a/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/Info.plist and b/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/Info.plist differ diff --git a/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/PvPorcupine b/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/PvPorcupine index 85173483f9..f85c2ff126 100755 Binary files a/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/PvPorcupine and b/lib/ios/PvPorcupine.xcframework/ios-arm64_x86_64-simulator/PvPorcupine.framework/PvPorcupine differ