Skip to content

Commit

Permalink
V2.1 ios (#371)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErisMik
ErisMik authored Dec 6, 2024
1 parent ef53947 commit 5255e8d
Show file tree
Hide file tree
Showing 15 changed files with 266 additions and 62 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ios-browserstack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
- name: Make build dir
run: mkdir ddp

- name: Copy test_resources
run: ./copy_test_resources.sh

- name: Inject AccessKey
run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
CheetahAppTestUITests/CheetahAppTestUITests.swift
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ios-perf.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:
- name: Make build dir
run: mkdir ddp

- name: Copy test_resources
run: ./copy_test_resources.sh

- name: Inject AccessKey
run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
PerformanceTest/PerformanceTest.swift
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/swift-codestyle.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- '**/*.swift'

jobs:
check-switch-codestyle:
check-swift-codestyle:
runs-on: ubuntu-latest

steps:
Expand All @@ -21,4 +21,4 @@ jobs:
- name: Check swift codestyle
uses: norio-nomura/[email protected]
with:
args: lint --config resources/.lint/swift/.swiftlint.yml --strict
args: lint --config resources/.lint/swift/.swiftlint.yml --strict
2 changes: 1 addition & 1 deletion binding/ios/Cheetah-iOS.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'Cheetah-iOS'
s.module_name = 'Cheetah'
s.version = '2.0.1'
s.version = '2.1.0'
s.license = {:type => 'Apache 2.0'}
s.summary = 'iOS SDK for Picovoice\'s Cheetah speech-to-text engine.'
s.description =
Expand Down
3 changes: 3 additions & 0 deletions binding/ios/CheetahAppTest/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ build/*
xcuserdata
Pods
ddp

CheetahAppTestUITests/test_resources/*
!CheetahAppTestUITests/test_resources/.gitkeep
87 changes: 64 additions & 23 deletions binding/ios/CheetahAppTest/CheetahAppTest.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
archiveVersion = 1;
classes = {
};
objectVersion = 55;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
072F6D492D02533000E29DF3 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 072F6D482D02533000E29DF3 /* test_resources */; };
1E00655827CFF7EB006FF6E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00655727CFF7EB006FF6E9 /* AppDelegate.swift */; };
1E00655C27CFF7EB006FF6E9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00655B27CFF7EB006FF6E9 /* ViewController.swift */; };
1E00655F27CFF7EB006FF6E9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E00655D27CFF7EB006FF6E9 /* Main.storyboard */; };
1E00656127CFF7EC006FF6E9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1E00656027CFF7EC006FF6E9 /* Assets.xcassets */; };
1E00656427CFF7EC006FF6E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E00656227CFF7EC006FF6E9 /* LaunchScreen.storyboard */; };
1E00657927CFF7EC006FF6E9 /* CheetahAppTestUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */; };
1E00658A27CFFAB3006FF6E9 /* test.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1E00658927CFFAB3006FF6E9 /* test.wav */; };
1E00658C27CFFABD006FF6E9 /* cheetah_params.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */; };
1E5B7B332800F75900F8BDDB /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5B7B322800F75900F8BDDB /* PerformanceTest.swift */; };
1E5B7B362800F77300F8BDDB /* test.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1E5B7B352800F77300F8BDDB /* test.wav */; };
1E5B7B382800F7AA00F8BDDB /* cheetah_params.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E5B7B372800F7AA00F8BDDB /* cheetah_params.pv */; };
Expand Down Expand Up @@ -42,6 +41,21 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
072F6D482D02533000E29DF3 /* test_resources */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test_resources; path = CheetahAppTestUITests/test_resources; sourceTree = "<group>"; };
07E777C32D02632A005A41E7 /* test.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test.wav; sourceTree = "<group>"; };
07E777C42D02632A005A41E7 /* test_de.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_de.wav; sourceTree = "<group>"; };
07E777C52D02632A005A41E7 /* test_es.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_es.wav; sourceTree = "<group>"; };
07E777C62D02632A005A41E7 /* test_fr.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_fr.wav; sourceTree = "<group>"; };
07E777C72D02632A005A41E7 /* test_it.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_it.wav; sourceTree = "<group>"; };
07E777C82D02632A005A41E7 /* test_pt.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_pt.wav; sourceTree = "<group>"; };
07E777CA2D02632A005A41E7 /* cheetah_params.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params.pv; sourceTree = "<group>"; };
07E777CB2D02632A005A41E7 /* cheetah_params_de.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_de.pv; sourceTree = "<group>"; };
07E777CC2D02632A005A41E7 /* cheetah_params_es.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_es.pv; sourceTree = "<group>"; };
07E777CD2D02632A005A41E7 /* cheetah_params_fr.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_fr.pv; sourceTree = "<group>"; };
07E777CE2D02632A005A41E7 /* cheetah_params_it.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_it.pv; sourceTree = "<group>"; };
07E777CF2D02632A005A41E7 /* cheetah_params_pt.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_pt.pv; sourceTree = "<group>"; };
07E777D12D02632A005A41E7 /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
07E777D22D02632A005A41E7 /* test_data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = test_data.json; sourceTree = "<group>"; };
1E00655427CFF7EB006FF6E9 /* CheetahAppTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CheetahAppTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
1E00655727CFF7EB006FF6E9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
1E00655B27CFF7EB006FF6E9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -52,8 +66,6 @@
1E00657427CFF7EC006FF6E9 /* CheetahAppTestUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CheetahAppTestUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheetahAppTestUITests.swift; sourceTree = "<group>"; };
1E00658827CFFA3C006FF6E9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1E00658927CFFAB3006FF6E9 /* test.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = test.wav; path = ../../../../resources/audio_samples/test.wav; sourceTree = "<group>"; };
1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheetah_params.pv; path = ../../../../lib/common/cheetah_params.pv; sourceTree = "<group>"; };
1E5B7B302800F6FE00F8BDDB /* PerformanceTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
1E5B7B322800F75900F8BDDB /* PerformanceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformanceTest.swift; sourceTree = "<group>"; };
1E5B7B342800F76700F8BDDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -90,9 +102,47 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
07E777C92D02632A005A41E7 /* audio_samples */ = {
isa = PBXGroup;
children = (
07E777C32D02632A005A41E7 /* test.wav */,
07E777C42D02632A005A41E7 /* test_de.wav */,
07E777C52D02632A005A41E7 /* test_es.wav */,
07E777C62D02632A005A41E7 /* test_fr.wav */,
07E777C72D02632A005A41E7 /* test_it.wav */,
07E777C82D02632A005A41E7 /* test_pt.wav */,
);
path = audio_samples;
sourceTree = "<group>";
};
07E777D02D02632A005A41E7 /* model_files */ = {
isa = PBXGroup;
children = (
07E777CA2D02632A005A41E7 /* cheetah_params.pv */,
07E777CB2D02632A005A41E7 /* cheetah_params_de.pv */,
07E777CC2D02632A005A41E7 /* cheetah_params_es.pv */,
07E777CD2D02632A005A41E7 /* cheetah_params_fr.pv */,
07E777CE2D02632A005A41E7 /* cheetah_params_it.pv */,
07E777CF2D02632A005A41E7 /* cheetah_params_pt.pv */,
);
path = model_files;
sourceTree = "<group>";
};
07E777D32D02632A005A41E7 /* test_resources */ = {
isa = PBXGroup;
children = (
07E777C92D02632A005A41E7 /* audio_samples */,
07E777D02D02632A005A41E7 /* model_files */,
07E777D12D02632A005A41E7 /* .gitkeep */,
07E777D22D02632A005A41E7 /* test_data.json */,
);
path = test_resources;
sourceTree = "<group>";
};
1E00654B27CFF7EB006FF6E9 = {
isa = PBXGroup;
children = (
072F6D482D02533000E29DF3 /* test_resources */,
1E5B7B312800F71E00F8BDDB /* PerformanceTest */,
1E00655627CFF7EB006FF6E9 /* CheetahAppTest */,
1E00657727CFF7EC006FF6E9 /* CheetahAppTestUITests */,
Expand Down Expand Up @@ -127,8 +177,7 @@
1E00657727CFF7EC006FF6E9 /* CheetahAppTestUITests */ = {
isa = PBXGroup;
children = (
1E00658927CFFAB3006FF6E9 /* test.wav */,
1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */,
07E777D32D02632A005A41E7 /* test_resources */,
1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */,
1E00658827CFFA3C006FF6E9 /* Info.plist */,
);
Expand Down Expand Up @@ -242,7 +291,7 @@
);
mainGroup = 1E00654B27CFF7EB006FF6E9;
packageReferences = (
E15A377C2CF7B6D600A96F85 /* XCRemoteSwiftPackageReference "cheetah" */,
07BA482F2D01233800A57078 /* XCLocalSwiftPackageReference "../../../../cheetah" */,
);
productRefGroup = 1E00655527CFF7EB006FF6E9 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -270,8 +319,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1E00658C27CFFABD006FF6E9 /* cheetah_params.pv in Resources */,
1E00658A27CFFAB3006FF6E9 /* test.wav in Resources */,
072F6D492D02533000E29DF3 /* test_resources in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -524,7 +572,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 65723695GD;
DEVELOPMENT_TEAM = 8TK4L7UF2X;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -546,7 +594,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 65723695GD;
DEVELOPMENT_TEAM = 8TK4L7UF2X;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -652,23 +700,16 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
07BA482F2D01233800A57078 /* XCLocalSwiftPackageReference "../../../../cheetah" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../../../../cheetah;
};
E1E0C7FE2CF11FD9001D6D84 /* XCLocalSwiftPackageReference "../../../../cheetah" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../../../../cheetah;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
E15A377C2CF7B6D600A96F85 /* XCRemoteSwiftPackageReference "cheetah" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Picovoice/cheetah";
requirement = {
kind = exactVersion;
version = 2.0.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
E1E0C8002CF120B0001D6D84 /* Cheetah */ = {
isa = XCSwiftPackageProductDependency;
Expand Down
Loading

0 comments on commit 5255e8d

Please sign in to comment.