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

Author: albho

.github/workflows/ios-browserstack.yml

@@ -35,23 +35,17 @@ jobs:
       - run:
           pip3 install requests
 
-      - name: Install Cocoapods
-        run: gem install cocoapods
-
       - name: Make build dir
         run: mkdir ddp
 
-      - name: Run Cocoapods
-        run: pod install
-
-      - name: Inject AppID
+      - name: Inject AccessKey
         run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
           KoalaAppTestUITests/KoalaAppTestUITests.swift
 
       - name: XCode Build
         run: xcrun xcodebuild build-for-testing
           -configuration Debug
-          -workspace KoalaAppTest.xcworkspace
+          -project KoalaAppTest.xcodeproj
           -sdk iphoneos
           -scheme KoalaAppTest
           -derivedDataPath ddp

.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
         run: xcrun xcodebuild build
           -configuration Debug
-          -workspace KoalaDemo.xcworkspace
+          -project KoalaDemo.xcodeproj
           -sdk iphoneos
           -scheme KoalaDemo
           -derivedDataPath ddp

.github/workflows/ios-perf.yml

@@ -42,15 +42,9 @@ jobs:
       - run:
           pip3 install requests
 
-      - name: Install Cocoapods
-        run: gem install cocoapods
-
       - name: Make build dir
         run: mkdir ddp
 
-      - 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
@@ -67,7 +61,7 @@ jobs:
       - name: XCode Build
         run: xcrun xcodebuild build-for-testing
           -configuration Debug
-          -workspace KoalaAppTest.xcworkspace
+          -project KoalaAppTest.xcodeproj
           -sdk iphoneos
           -scheme PerformanceTest
           -derivedDataPath ddp

.gitignore

@@ -1,2 +1,5 @@
 .DS_Store
-.idea
+.idea
+.build
+Package.resolved
+.swiftpm

.gitmodules

@@ -1,6 +1,6 @@
 [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 = ../../Picovoice/pvrecorder.git
+	url = https://github.com/Picovoice/pvrecorder.git

Package.swift

@@ -0,0 +1,36 @@
+// swift-tools-version:5.3
+import PackageDescription
+let package = Package(
+    name: "Koala-iOS",
+    platforms: [
+        .iOS(.v13)
+    ],
+    products: [
+        .library(
+            name: "Koala",
+            targets: ["Koala"]
+        )
+    ],
+    targets: [
+        .binaryTarget(
+            name: "PvKoala",
+            path: "lib/ios/PvKoala.xcframework"
+        ),
+        .target(
+            name: "Koala",
+            dependencies: ["PvKoala"],
+            path: ".",
+            exclude: [
+                "binding/ios/KoalaAppTest",
+                "demo"
+            ],
+            sources: [
+                "binding/ios/Koala.swift",
+                "binding/ios/KoalaErrors.swift"
+            ],
+            resources: [
+               .copy("lib/common/koala_params.pv")
+            ]
+        )
+    ]
+)

README.md

@@ -92,7 +92,7 @@ Before building the demo app, run the following from [`KoalaDemo`](./demo/ios/Ko
 pod install
 ```
 
-Open [KoalaDemo.xcworkspace](./demo/ios/KoalaDemo/KoalaDemo.xcworkspace) and run the demo.
+Open [KoalaDemo.xcodeproj](./demo/ios/KoalaDemo/KoalaDemo.xcodeproj) and run the demo.
 
 
 ### C Demos

binding/ios/Koala-iOS.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = 'Koala-iOS'
   s.module_name = 'Koala'
-  s.version = '2.0.0'
+  s.version = '2.0.1'
   s.license = {:type => 'Apache 2.0'}
   s.summary = 'iOS SDK for Picovoice\'s Koala Noise Suppression Engine'
   s.description =
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   DESC
   s.homepage = 'https://github.com/Picovoice/koala/tree/main/binding/ios'
   s.author = { 'Picovoice' => 'hello@picovoice.ai' }
-  s.source = { :git => "https://github.com/Picovoice/koala.git", :tag => "Koala-iOS-v2.0.0" }
+  s.source = { :git => "https://github.com/Picovoice/koala.git", :tag => s.version.to_s }
   s.ios.deployment_target = '13.0'
   s.swift_version = '5.0'
   s.vendored_frameworks = 'lib/ios/PvKoala.xcframework'

binding/ios/Koala.swift

@@ -1,17 +1,25 @@
 //
-//  Copyright 2023 Picovoice Inc.
+//  Copyright 2023-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 PvKoala
 
 /// iOS binding for Koala Noise Suppression Engine. Provides a Swift interface to the Koala library.
 public class Koala {
 
+#if SWIFT_PACKAGE
+
+    static let resourceBundle = Bundle.module
+
+#else
+
     static let resourceBundle: Bundle = {
         let myBundle = Bundle(for: Koala.self)
 
@@ -29,6 +37,8 @@ public class Koala {
         return resourceBundle
     }()
 
+#endif
+
     private var handle: OpaquePointer?
 
     /// The number of audio samples per frame.