Ios cleanup (#646)

Picovoice · Jan 21, 2022 · d9158ad · d9158ad
1 parent c9bcda4
commit d9158ad
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 48 deletions.
diff --git a/demo/flutter/ios/Podfile b/demo/flutter/ios/Podfile
@@ -32,9 +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'
 end
 
 post_install do |installer|

diff --git a/demo/flutter/ios/Podfile.lock b/demo/flutter/ios/Podfile.lock
@@ -15,12 +15,12 @@ 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`)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
+    - Porcupine-iOS
 
 EXTERNAL SOURCES:
   Flutter:
@@ -29,24 +29,17 @@ 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"
 
-CHECKOUT OPTIONS:
-  Porcupine-iOS:
-    :commit: 69d93e4aea98f9d582d34a890843a30b31a5fe86
-    :git: https://github.com/Picovoice/porcupine.git
-
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_voice_processor: afb59b604d99397a1ccf15c935ac8f2c2327f09f
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  Porcupine-iOS: 3ba921ebae3daf2edff3f9aee4ac71e3c3bc6e36
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
   porcupine_flutter: d07702351800af8cd7918e1333bb87359771c347
 
-PODFILE CHECKSUM: 018fc0dab91cf4c7313c15f2be373be87ec6d970
+PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
 
 COCOAPODS: 1.11.2
diff --git a/demo/ios/BackgroundService/Podfile b/demo/ios/BackgroundService/Podfile
@@ -2,6 +2,6 @@ source 'https://cdn.cocoapods.org/'
 platform :ios, '9.0'
 
 target 'PorcupineBackgroundServiceDemo' do
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
+    pod 'Porcupine-iOS', '~> 2.1.0'
     pod 'SwiftySound'
 end
diff --git a/demo/ios/BackgroundService/Podfile.lock b/demo/ios/BackgroundService/Podfile.lock
@@ -5,28 +5,20 @@ PODS:
   - SwiftySound (1.2.0)
 
 DEPENDENCIES:
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec`)
+  - Porcupine-iOS (~> 2.1.0)
   - SwiftySound
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
+    - Porcupine-iOS
     - SwiftySound
 
-EXTERNAL SOURCES:
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec
-
-CHECKOUT OPTIONS:
-  Porcupine-iOS:
-    :commit: 55303bf1a927ceb34201a12fce0d00ae33a8d9ce
-    :git: https://github.com/Picovoice/porcupine.git
-
 SPEC CHECKSUMS:
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Porcupine-iOS: 9c30c8ace57462531beef701a72a368f45a304d0
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
   SwiftySound: 9eb28bb14edb601b40027e44319e0ef8383f88bf
 
-PODFILE CHECKSUM: fe31e4fe02de414a6044fc632d75f217c2887aac
+PODFILE CHECKSUM: f0b25d7ca7bd2770190dbd6b9339f4d0827b9614
 
 COCOAPODS: 1.11.2
diff --git a/demo/ios/ForegroundApp/Podfile b/demo/ios/ForegroundApp/Podfile
@@ -2,9 +2,9 @@ source 'https://cdn.cocoapods.org/'
 platform :ios, '9.0'
 
 target 'PorcupineForegroundAppDemo' do
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
+    pod 'Porcupine-iOS', '~> 2.1.0'
 end
 
 target 'PorcupineForegroundAppDemoUITests' do
-    pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
+    pod 'Porcupine-iOS', '~> 2.1.0'
 end
diff --git a/demo/ios/ForegroundApp/Podfile.lock b/demo/ios/ForegroundApp/Podfile.lock
@@ -4,25 +4,17 @@ PODS:
     - ios-voice-processor (~> 1.0.2)
 
 DEPENDENCIES:
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec`)
+  - Porcupine-iOS (~> 2.1.0)
 
 SPEC REPOS:
   trunk:
     - ios-voice-processor
-
-EXTERNAL SOURCES:
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1-ios/binding/ios/Porcupine-iOS.podspec
-
-CHECKOUT OPTIONS:
-  Porcupine-iOS:
-    :commit: 55303bf1a927ceb34201a12fce0d00ae33a8d9ce
-    :git: https://github.com/Picovoice/porcupine.git
+    - Porcupine-iOS
 
 SPEC CHECKSUMS:
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Porcupine-iOS: 9c30c8ace57462531beef701a72a368f45a304d0
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
 
-PODFILE CHECKSUM: 2f3bd096148a845a64245e044e1a1e407b015e1d
+PODFILE CHECKSUM: fe5be4ed9e00fe63fc4b83bd852e3376caa24c38
 
 COCOAPODS: 1.11.2
diff --git a/demo/react-native/ios/Podfile b/demo/react-native/ios/Podfile
@@ -6,7 +6,4 @@ platform :ios, '10.0'
 target 'PorcupineDemo' do
   config = use_native_modules!
   use_react_native!(:path => config["reactNativePath"])
-
-  # remove
-  pod 'Porcupine-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec'
 end
diff --git a/demo/react-native/ios/Podfile.lock b/demo/react-native/ios/Podfile.lock
@@ -263,7 +263,6 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - Porcupine-iOS (from `https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec`)
   - "porcupine-react-native (from `../node_modules/@picovoice/porcupine-react-native`)"
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -295,6 +294,7 @@ SPEC REPOS:
   trunk:
     - boost-for-react-native
     - ios-voice-processor
+    - Porcupine-iOS
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -307,8 +307,6 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
-  Porcupine-iOS:
-    :podspec: https://raw.githubusercontent.com/Picovoice/porcupine/v2.1/binding/ios/Porcupine-iOS.podspec
   porcupine-react-native:
     :path: "../node_modules/@picovoice/porcupine-react-native"
   RCTRequired:
@@ -366,7 +364,7 @@ SPEC CHECKSUMS:
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc
-  Porcupine-iOS: 3ba921ebae3daf2edff3f9aee4ac71e3c3bc6e36
+  Porcupine-iOS: 35f3cd9e60b1178631a819e16462ff41894cbf20
   porcupine-react-native: bbb4e37c3617bcbb2a555bfb413b0095d1d3217d
   RCTRequired: 48884c74035a0b5b76dbb7a998bd93bcfc5f2047
   RCTTypeSafety: edf4b618033c2f1c5b7bc3d90d8e085ed95ba2ab
@@ -392,6 +390,6 @@ SPEC CHECKSUMS:
   RNCPicker: 0991c56da7815c0cf946d6f63cf920b25296e5f6
   Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
 
-PODFILE CHECKSUM: 3a0cf2f1b2cb2cba621d58fae449dba32c16fac9
+PODFILE CHECKSUM: dbacea9ba79da517ca6fb72d15a44049206fe690
 
 COCOAPODS: 1.11.2