Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPM compatible #48

Merged
merged 4 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/ios-browserstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ jobs:
- run:
pip3 install requests

- name: Install Cocoapods
run: gem install cocoapods

- name: Make build dir
run: mkdir ddp

Expand All @@ -49,17 +46,14 @@ jobs:
- 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}}:'
OrcaAppTestUITests/BaseTest.swift

- name: XCode Build
run: xcrun xcodebuild build-for-testing
-configuration Debug
-workspace OrcaAppTest.xcworkspace
-project OrcaAppTest.xcodeproj
-sdk iphoneos
-scheme OrcaAppTest
-derivedDataPath ddp
Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/ios-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,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 Demo
run: xcrun xcodebuild build
-configuration Debug
-workspace OrcaDemo.xcworkspace
-project OrcaDemo.xcodeproj
-sdk iphoneos
-scheme OrcaDemo
-derivedDataPath ddp
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/ios-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,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}}:'
OrcaAppTestUITests/BaseTest.swift
Expand All @@ -64,13 +58,13 @@ jobs:

- name: Inject Performance Threshold
run: sed -i '.bak'
'1,/{PERFORMANCE_THRESHOLD_SEC}/s/{PERFORMANCE_THRESHOLD_SEC}/${{ matrix.performanceThresholdSec }}/'
'1,/{PROC_PERFORMANCE_THRESHOLD_SEC}/s/{PROC_PERFORMANCE_THRESHOLD_SEC}/${{ matrix.performanceThresholdSec }}/'
PerformanceTest/PerformanceTest.swift

- name: XCode Build
run: xcrun xcodebuild build-for-testing
-configuration Debug
-workspace OrcaAppTest.xcworkspace
-project OrcaAppTest.xcodeproj
-sdk iphoneos
-scheme PerformanceTest
-derivedDataPath ddp
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.DS_Store
.idea
.idea
.build
Package.resolved
.swiftpm
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "demo/c/dr_libs"]
path = demo/c/dr_libs
url = ../../mackron/dr_libs.git
url = https://github.com/mackron/dr_libs.git
33 changes: 33 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// swift-tools-version:5.3
import PackageDescription
let package = Package(
name: "Orca-iOS",
platforms: [
.iOS(.v13)
],
products: [
.library(
name: "Orca",
targets: ["Orca"]
)
],
targets: [
.binaryTarget(
name: "PvOrca",
path: "lib/ios/PvOrca.xcframework"
),
.target(
name: "Orca",
dependencies: ["PvOrca"],
path: ".",
exclude: [
"binding/ios/OrcaAppTest",
"demo"
],
sources: [
"binding/ios/Orca.swift",
"binding/ios/OrcaErrors.swift"
]
)
]
)
4 changes: 2 additions & 2 deletions binding/ios/Orca-iOS.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'Orca-iOS'
s.module_name = 'Orca'
s.version = '1.0.0'
s.version = '1.0.1'
s.license = {:type => 'Apache 2.0'}
s.summary = 'iOS binding for Picovoice\'s Orca Text-to-Speech Engine.'
s.description =
Expand All @@ -18,7 +18,7 @@ Pod::Spec.new do |s|
DESC
s.homepage = 'https://github.com/Picovoice/orca/tree/main/binding/ios'
s.author = { 'Picovoice' => '[email protected]' }
s.source = { :git => "https://github.com/Picovoice/orca.git", :tag => "Orca-iOS-v1.0.0" }
s.source = { :git => "https://github.com/Picovoice/orca.git", :tag => s.version.to_s }
s.ios.deployment_target = '13.0'
s.swift_version = '5.0'
s.vendored_frameworks = 'lib/ios/PvOrca.xcframework'
Expand Down
2 changes: 2 additions & 0 deletions binding/ios/Orca.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
// specific language governing permissions and limitations under the License.
//

import Foundation

import PvOrca

public struct OrcaPhoneme {
Expand Down
Loading
Loading