Remove bitcode from iOS and make available on SPM (#405)

Picovoice · Dec 24, 2024 · a40f412 · a40f412
1 parent 1c6f3a8
commit a40f412
Show file tree

Hide file tree

Showing 29 changed files with 653 additions and 1,611 deletions.
diff --git a/.github/workflows/ios-browserstack.yml b/.github/workflows/ios-browserstack.yml
@@ -33,29 +33,20 @@ jobs:
       - run:
           pip3 install requests
 
-      - 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: Copy test_resources
         run: ./copy_test_resources.sh
 
-      - name: Run Cocoapods
-        run: pod install
-
       - name: Inject AccessKey
         run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
           LeopardAppTestUITests/LeopardAppTestUITests.swift
 
       - name: XCode Build
         run: xcrun xcodebuild build-for-testing
           -configuration Debug
-          -workspace LeopardAppTest.xcworkspace
+          -project LeopardAppTest.xcodeproj
           -sdk iphoneos
           -scheme LeopardAppTest
           -derivedDataPath ddp

diff --git a/.github/workflows/ios-demos.yml b/.github/workflows/ios-demos.yml
@@ -25,24 +25,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: Make build dir
-        run: mkdir ddp
-
-      - name: Run Cocoapods
-        run: pod install
-
       - name: Build English
         run: xcrun xcodebuild build
           -configuration Debug
-          -workspace LeopardDemo.xcworkspace
+          -project LeopardDemo.xcodeproj
           -sdk iphoneos
           -scheme _enDemo
           -derivedDataPath ddp
@@ -51,7 +37,7 @@ jobs:
       - name: Build Other Language
         run: xcrun xcodebuild build
           -configuration Debug
-          -workspace LeopardDemo.xcworkspace
+          -project LeopardDemo.xcodeproj
           -sdk iphoneos
           -scheme koDemo
           -derivedDataPath ddp

diff --git a/.github/workflows/ios-perf.yml b/.github/workflows/ios-perf.yml
@@ -43,18 +43,12 @@ jobs:
       - run:
           pip3 install requests
 
-      - name: Install Cocoapods
-        run: gem install cocoapods
-
       - name: Make build dir
         run: mkdir ddp
 
       - name: Copy test_resources
         run: ./copy_test_resources.sh
 
-      - name: Run Cocoapods
-        run: pod install
-
       - name: Inject AccessKey
         run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
           PerformanceTest/PerformanceTest.swift
@@ -76,7 +70,7 @@ jobs:
       - name: XCode Build
         run: xcrun xcodebuild build-for-testing
           -configuration Debug
-          -workspace LeopardAppTest.xcworkspace
+          -project LeopardAppTest.xcodeproj
           -sdk iphoneos
           -scheme PerformanceTest
           -derivedDataPath ddp

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 .idea/
 **/__pycache__/
-.DS_Store
+.DS_Store
+.build
+Package.resolved
+.swiftpm
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,35 @@
+// swift-tools-version:5.3
+import PackageDescription
+let package = Package(
+    name: "Leopard-iOS",
+    platforms: [
+        .iOS(.v13)
+    ],
+    products: [
+        .library(
+            name: "Leopard",
+            targets: ["Leopard"]
+        )
+    ],
+    targets: [
+        .binaryTarget(
+            name: "PvLeopard",
+            path: "lib/ios/PvLeopard.xcframework"
+        ),
+        .target(
+            name: "Leopard",
+            dependencies: ["PvLeopard"],
+            path: ".",
+            exclude: [
+                "binding/ios/LeopardAppTest",
+                "binding/flutter",
+                "binding/react-native",
+                "demo"
+            ],
+            sources: [
+                "binding/ios/Leopard.swift",
+                "binding/ios/LeopardErrors.swift"
+            ]
+        )
+    ]
+)
diff --git a/binding/ios/Leopard-iOS.podspec b/binding/ios/Leopard-iOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = 'Leopard-iOS'
   s.module_name = 'Leopard'
-  s.version = '2.0.1'
+  s.version = '2.0.2'
   s.license = {:type => 'Apache 2.0'}
   s.summary = 'iOS SDK for Picovoice\'s Leopard speech-to-text engine.'
   s.description =
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   DESC
   s.homepage = 'https://github.com/Picovoice/leopard/tree/master/binding/ios'
   s.author = { 'Picovoice' => '[email protected]' }
-  s.source = { :git => "https://github.com/Picovoice/leopard.git", :tag => "Leopard-iOS-v2.0.1" }
+  s.source = { :git => "https://github.com/Picovoice/leopard.git", :tag => s.version.to_s }
   s.ios.deployment_target = '13.0'
   s.swift_version = '5.0'
   s.vendored_frameworks = 'lib/ios/PvLeopard.xcframework'

diff --git a/binding/ios/Leopard.swift b/binding/ios/Leopard.swift
@@ -1,12 +1,14 @@
 //
-//  Copyright 2022-2023 Picovoice Inc.
+//  Copyright 2022-2024 Picovoice Inc.
 //  You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 //  file accompanying this source.
 //  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 //  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 //  specific language governing permissions and limitations under the License.
 //
 
+import Foundation
+
 import PvLeopard
 
 public struct LeopardWord {