Ios cleanup (#285)

Picovoice · Jan 21, 2022 · ae9ccf5 · ae9ccf5
1 parent e5f7341
commit ae9ccf5
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 186 deletions.
diff --git a/demo/flutter-clock/ios/Podfile b/demo/flutter-clock/ios/Podfile
@@ -32,10 +32,6 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-
-  # remove
-  pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-  pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
 end
 
 post_install do |installer|

diff --git a/demo/flutter-clock/ios/Podfile.lock b/demo/flutter-clock/ios/Podfile.lock
@@ -28,14 +28,14 @@ DEPENDENCIES:
   - flutter_voice_processor (from `.symlinks/plugins/flutter_voice_processor/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec`)
   - porcupine_flutter (from `.symlinks/plugins/porcupine_flutter/ios`)
-  - Rhino-iOS (from `https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec`)
   - rhino_flutter (from `.symlinks/plugins/rhino_flutter/ios`)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
+    - Porcupine-iOS
+    - Rhino-iOS
     - Toast
 
 EXTERNAL SOURCES:
@@ -49,36 +49,24 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/fluttertoast/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec
   porcupine_flutter:
     :path: ".symlinks/plugins/porcupine_flutter/ios"
-  Rhino-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec
   rhino_flutter:
     :path: ".symlinks/plugins/rhino_flutter/ios"
 
-CHECKOUT OPTIONS:
-  Porcupine-iOS:
-    :commit: 0dd87f861e20f3817417ee1efcc7a10ffdcef56e
-    :git: https://github.com/Picovoice/porcupine.git
-  Rhino-iOS:
-    :commit: f1d64900e577fcb3ca81be861eae8cdf848e53f0
-    :git: https://github.com/Picovoice/rhino.git
-
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_ringtone_player: 15eba85187230b87b2512f0e1b92225618bc03e7
   flutter_voice_processor: afb59b604d99397a1ccf15c935ac8f2c2327f09f
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  Porcupine-iOS: 3ba921ebae3daf2edff3f9aee4ac71e3c3bc6e36
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
   porcupine_flutter: d07702351800af8cd7918e1333bb87359771c347
-  Rhino-iOS: e3bac436f6452b021dae549f66a271ce5eb34106
+  Rhino-iOS: b30668ab5d4a2e18d61bd1bc10f0ae41e0e202c5
   rhino_flutter: 9a6eab42e344c9ab9f641c2433eb89a582f5b786
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
 
-PODFILE CHECKSUM: a25ec8b435b1e66ed08fea785ee7b6acd948f1b7
+PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
 
 COCOAPODS: 1.11.2
diff --git a/demo/flutter/ios/Podfile b/demo/flutter/ios/Podfile
@@ -32,10 +32,6 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-
-  # remove
-  pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-  pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
 end
 
 post_install do |installer|

diff --git a/demo/flutter/ios/Podfile.lock b/demo/flutter/ios/Podfile.lock
@@ -20,14 +20,14 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_voice_processor (from `.symlinks/plugins/flutter_voice_processor/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec`)
   - porcupine_flutter (from `.symlinks/plugins/porcupine_flutter/ios`)
-  - Rhino-iOS (from `https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec`)
   - rhino_flutter (from `.symlinks/plugins/rhino_flutter/ios`)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
+    - Porcupine-iOS
+    - Rhino-iOS
 
 EXTERNAL SOURCES:
   Flutter:
@@ -36,12 +36,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_voice_processor/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec
   porcupine_flutter:
     :path: ".symlinks/plugins/porcupine_flutter/ios"
-  Rhino-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec
   rhino_flutter:
     :path: ".symlinks/plugins/rhino_flutter/ios"
 
@@ -50,11 +46,11 @@ SPEC CHECKSUMS:
   flutter_voice_processor: afb59b604d99397a1ccf15c935ac8f2c2327f09f
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  Porcupine-iOS: 3ba921ebae3daf2edff3f9aee4ac71e3c3bc6e36
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
   porcupine_flutter: d07702351800af8cd7918e1333bb87359771c347
-  Rhino-iOS: e3bac436f6452b021dae549f66a271ce5eb34106
+  Rhino-iOS: b30668ab5d4a2e18d61bd1bc10f0ae41e0e202c5
   rhino_flutter: 9a6eab42e344c9ab9f641c2433eb89a582f5b786
 
-PODFILE CHECKSUM: 5b937aa5842c99fb249b7d190dbc0673d383dd4f
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
 COCOAPODS: 1.11.2
diff --git a/demo/ios-swiftui/Podfile b/demo/ios-swiftui/Podfile
@@ -3,9 +3,5 @@ source 'https://cdn.cocoapods.org/'
 platform :ios, '9.0'
 
 target 'BaristaDemo' do    
-    pod 'Picovoice-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/picovoice/v2.1/sdk/ios/Picovoice-iOS.podspec'
-
-    # remove
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-    pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
+    pod 'Picovoice-iOS', '~> 2.1.0'
 end
diff --git a/demo/ios-swiftui/Podfile.lock b/demo/ios-swiftui/Podfile.lock
@@ -10,39 +10,21 @@ PODS:
     - ios-voice-processor (~> 1.0.2)
 
 DEPENDENCIES:
-  - Picovoice-iOS (from `https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec`)
-  - Rhino-iOS (from `https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec`)
+  - Picovoice-iOS (~> 2.1.0)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
-
-EXTERNAL SOURCES:
-  Picovoice-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec
-  Rhino-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec
-
-CHECKOUT OPTIONS:
-  Picovoice-iOS:
-    :commit: 244a0b28d065879eb23dd1605d40c57957b715fb
-    :git: https://github.com/Picovoice/picovoice.git
-  Porcupine-iOS:
-    :commit: 70c98afd80d5d5c46c5f4ced9fb69cc07f1513e2
-    :git: https://github.com/Picovoice/porcupine.git
-  Rhino-iOS:
-    :commit: 448b3eca87188d12b653e4427d499778673fed91
-    :git: https://github.com/Picovoice/rhino.git
+    - Picovoice-iOS
+    - Porcupine-iOS
+    - Rhino-iOS
 
 SPEC CHECKSUMS:
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Picovoice-iOS: a0345eb163a0815033ee3b7ee3416d728fb8ad75
-  Porcupine-iOS: 9c30c8ace57462531beef701a72a368f45a304d0
-  Rhino-iOS: 078fe741c7103f8508f04623cca74f992e01183c
+  Picovoice-iOS: d617b931677bb5ee0499b66ae1388d0cf552d70c
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
+  Rhino-iOS: b30668ab5d4a2e18d61bd1bc10f0ae41e0e202c5
 
-PODFILE CHECKSUM: 354182abf252caddeb723a0d18cb7619b8e7a2a1
+PODFILE CHECKSUM: b1519e61e088ed481fac526fe40086d0d9813f7b
 
 COCOAPODS: 1.11.2
diff --git a/demo/ios/BackgroundService/Podfile b/demo/ios/BackgroundService/Podfile
@@ -3,10 +3,6 @@ source 'https://cdn.cocoapods.org/'
 platform :ios, '9.0'
 
 target 'PicovoiceBackgroundServiceDemo' do
-    pod 'Picovoice-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/picovoice/v2.1/sdk/ios/Picovoice-iOS.podspec'
+    pod 'Picovoice-iOS', '~> 2.1.0'
     pod 'SwiftySound'
-
-    # remove
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-    pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
 end
diff --git a/demo/ios/BackgroundService/Podfile.lock b/demo/ios/BackgroundService/Podfile.lock
@@ -11,42 +11,24 @@ PODS:
   - SwiftySound (1.2.0)
 
 DEPENDENCIES:
-  - Picovoice-iOS (from `https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec`)
-  - Rhino-iOS (from `https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec`)
+  - Picovoice-iOS (~> 2.1.0)
   - SwiftySound
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
+    - Picovoice-iOS
+    - Porcupine-iOS
+    - Rhino-iOS
     - SwiftySound
 
-EXTERNAL SOURCES:
-  Picovoice-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec
-  Rhino-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec
-
-CHECKOUT OPTIONS:
-  Picovoice-iOS:
-    :commit: 244a0b28d065879eb23dd1605d40c57957b715fb
-    :git: https://github.com/Picovoice/picovoice.git
-  Porcupine-iOS:
-    :commit: 70c98afd80d5d5c46c5f4ced9fb69cc07f1513e2
-    :git: https://github.com/Picovoice/porcupine.git
-  Rhino-iOS:
-    :commit: 448b3eca87188d12b653e4427d499778673fed91
-    :git: https://github.com/Picovoice/rhino.git
-
 SPEC CHECKSUMS:
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Picovoice-iOS: a0345eb163a0815033ee3b7ee3416d728fb8ad75
-  Porcupine-iOS: 9c30c8ace57462531beef701a72a368f45a304d0
-  Rhino-iOS: 078fe741c7103f8508f04623cca74f992e01183c
+  Picovoice-iOS: d617b931677bb5ee0499b66ae1388d0cf552d70c
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
+  Rhino-iOS: b30668ab5d4a2e18d61bd1bc10f0ae41e0e202c5
   SwiftySound: 9eb28bb14edb601b40027e44319e0ef8383f88bf
 
-PODFILE CHECKSUM: 59c613323f8a2cb5b6c477f90576d8a725d2bdfe
+PODFILE CHECKSUM: 44d436f18735f9248b29325b6b2e4f5be2cce1b5
 
 COCOAPODS: 1.11.2
diff --git a/demo/ios/ForegroundApp/Podfile b/demo/ios/ForegroundApp/Podfile
@@ -3,17 +3,9 @@ source 'https://cdn.cocoapods.org/'
 platform :ios, '9.0'
 
 target 'PicovoiceForegroundAppDemo' do
-    pod 'Picovoice-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/picovoice/v2.1/sdk/ios/Picovoice-iOS.podspec'
-
-    # remove
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-    pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
+    pod 'Picovoice-iOS', '~> 2.1.0'
 end
 
 target 'PicovoiceForegroundAppDemoUITests' do    
-    pod 'Picovoice-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/picovoice/v2.1/sdk/ios/Picovoice-iOS.podspec'
-
-    # remove
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-    pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
+    pod 'Picovoice-iOS', '~> 2.1.0'
 end
diff --git a/demo/ios/ForegroundApp/Podfile.lock b/demo/ios/ForegroundApp/Podfile.lock
@@ -10,39 +10,21 @@ PODS:
     - ios-voice-processor (~> 1.0.2)
 
 DEPENDENCIES:
-  - Picovoice-iOS (from `https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec`)
-  - Rhino-iOS (from `https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec`)
+  - Picovoice-iOS (~> 2.1.0)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
-
-EXTERNAL SOURCES:
-  Picovoice-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/picovoice/v2.1-ios/sdk/ios/Picovoice-iOS.podspec
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec
-  Rhino-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/rhino/v2.1-ios/binding/ios/Rhino-iOS.podspec
-
-CHECKOUT OPTIONS:
-  Picovoice-iOS:
-    :commit: 244a0b28d065879eb23dd1605d40c57957b715fb
-    :git: https://github.com/Picovoice/picovoice.git
-  Porcupine-iOS:
-    :commit: 70c98afd80d5d5c46c5f4ced9fb69cc07f1513e2
-    :git: https://github.com/Picovoice/porcupine.git
-  Rhino-iOS:
-    :commit: 448b3eca87188d12b653e4427d499778673fed91
-    :git: https://github.com/Picovoice/rhino.git
+    - Picovoice-iOS
+    - Porcupine-iOS
+    - Rhino-iOS
 
 SPEC CHECKSUMS:
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Picovoice-iOS: a0345eb163a0815033ee3b7ee3416d728fb8ad75
-  Porcupine-iOS: 9c30c8ace57462531beef701a72a368f45a304d0
-  Rhino-iOS: 078fe741c7103f8508f04623cca74f992e01183c
+  Picovoice-iOS: d617b931677bb5ee0499b66ae1388d0cf552d70c
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
+  Rhino-iOS: b30668ab5d4a2e18d61bd1bc10f0ae41e0e202c5
 
-PODFILE CHECKSUM: 8a4dbca95b7d95fca6315d3092dad305a413e801
+PODFILE CHECKSUM: fb00012d3a6986f21944d8d64e726f7a5891e787
 
 COCOAPODS: 1.11.2
diff --git a/demo/react-native-clock/ios/Podfile b/demo/react-native-clock/ios/Podfile
@@ -8,10 +8,6 @@ target 'ReactNativeClock' do
 
   use_react_native!(:path => config["reactNativePath"])
 
-    # remove
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
-    pod 'Rhino-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/rhino/v2.1/binding/ios/Rhino-iOS.podspec'
-
   post_install do |installer|
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|