Skip to content

Commit 5255e8d

Browse files
ErisMikErisMik
authored
V2.1 ios (#371)
1 parent ef53947 commit 5255e8d

File tree

15 files changed

+266
-62
lines changed

15 files changed

+266
-62
lines changed

‎.github/workflows/ios-browserstack.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
- name: Make build dir
3737
run: mkdir ddp
3838

39+
- name: Copy test_resources
40+
run: ./copy_test_resources.sh
41+
3942
- name: Inject AccessKey
4043
run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
4144
CheetahAppTestUITests/CheetahAppTestUITests.swift

‎.github/workflows/ios-perf.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ jobs:
4646
- name: Make build dir
4747
run: mkdir ddp
4848

49+
- name: Copy test_resources
50+
run: ./copy_test_resources.sh
51+
4952
- name: Inject AccessKey
5053
run: sed -i '.bak' 's:{TESTING_ACCESS_KEY_HERE}:${{secrets.PV_VALID_ACCESS_KEY}}:'
5154
PerformanceTest/PerformanceTest.swift

‎.github/workflows/swift-codestyle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '**/*.swift'
1313

1414
jobs:
15-
check-switch-codestyle:
15+
check-swift-codestyle:
1616
runs-on: ubuntu-latest
1717

1818
steps:
@@ -21,4 +21,4 @@ jobs:
2121
- name: Check swift codestyle
2222
uses: norio-nomura/[email protected]
2323
with:
24-
args: lint --config resources/.lint/swift/.swiftlint.yml --strict
24+
args: lint --config resources/.lint/swift/.swiftlint.yml --strict

‎binding/ios/Cheetah-iOS.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'Cheetah-iOS'
33
s.module_name = 'Cheetah'
4-
s.version = '2.0.1'
4+
s.version = '2.1.0'
55
s.license = {:type => 'Apache 2.0'}
66
s.summary = 'iOS SDK for Picovoice\'s Cheetah speech-to-text engine.'
77
s.description =

‎binding/ios/CheetahAppTest/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ build/*
1818
xcuserdata
1919
Pods
2020
ddp
21+
22+
CheetahAppTestUITests/test_resources/*
23+
!CheetahAppTestUITests/test_resources/.gitkeep

‎binding/ios/CheetahAppTest/CheetahAppTest.xcodeproj/project.pbxproj‎

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 55;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
072F6D492D02533000E29DF3 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 072F6D482D02533000E29DF3 /* test_resources */; };
1011
1E00655827CFF7EB006FF6E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00655727CFF7EB006FF6E9 /* AppDelegate.swift */; };
1112
1E00655C27CFF7EB006FF6E9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00655B27CFF7EB006FF6E9 /* ViewController.swift */; };
1213
1E00655F27CFF7EB006FF6E9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E00655D27CFF7EB006FF6E9 /* Main.storyboard */; };
1314
1E00656127CFF7EC006FF6E9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1E00656027CFF7EC006FF6E9 /* Assets.xcassets */; };
1415
1E00656427CFF7EC006FF6E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E00656227CFF7EC006FF6E9 /* LaunchScreen.storyboard */; };
1516
1E00657927CFF7EC006FF6E9 /* CheetahAppTestUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */; };
16-
1E00658A27CFFAB3006FF6E9 /* test.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1E00658927CFFAB3006FF6E9 /* test.wav */; };
17-
1E00658C27CFFABD006FF6E9 /* cheetah_params.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */; };
1817
1E5B7B332800F75900F8BDDB /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5B7B322800F75900F8BDDB /* PerformanceTest.swift */; };
1918
1E5B7B362800F77300F8BDDB /* test.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1E5B7B352800F77300F8BDDB /* test.wav */; };
2019
1E5B7B382800F7AA00F8BDDB /* cheetah_params.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E5B7B372800F7AA00F8BDDB /* cheetah_params.pv */; };
@@ -42,6 +41,21 @@
4241
/* End PBXContainerItemProxy section */
4342

4443
/* Begin PBXFileReference section */
44+
072F6D482D02533000E29DF3 /* test_resources */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test_resources; path = CheetahAppTestUITests/test_resources; sourceTree = "<group>"; };
45+
07E777C32D02632A005A41E7 /* test.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test.wav; sourceTree = "<group>"; };
46+
07E777C42D02632A005A41E7 /* test_de.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_de.wav; sourceTree = "<group>"; };
47+
07E777C52D02632A005A41E7 /* test_es.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_es.wav; sourceTree = "<group>"; };
48+
07E777C62D02632A005A41E7 /* test_fr.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_fr.wav; sourceTree = "<group>"; };
49+
07E777C72D02632A005A41E7 /* test_it.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_it.wav; sourceTree = "<group>"; };
50+
07E777C82D02632A005A41E7 /* test_pt.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = test_pt.wav; sourceTree = "<group>"; };
51+
07E777CA2D02632A005A41E7 /* cheetah_params.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params.pv; sourceTree = "<group>"; };
52+
07E777CB2D02632A005A41E7 /* cheetah_params_de.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_de.pv; sourceTree = "<group>"; };
53+
07E777CC2D02632A005A41E7 /* cheetah_params_es.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_es.pv; sourceTree = "<group>"; };
54+
07E777CD2D02632A005A41E7 /* cheetah_params_fr.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_fr.pv; sourceTree = "<group>"; };
55+
07E777CE2D02632A005A41E7 /* cheetah_params_it.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_it.pv; sourceTree = "<group>"; };
56+
07E777CF2D02632A005A41E7 /* cheetah_params_pt.pv */ = {isa = PBXFileReference; lastKnownFileType = file; path = cheetah_params_pt.pv; sourceTree = "<group>"; };
57+
07E777D12D02632A005A41E7 /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
58+
07E777D22D02632A005A41E7 /* test_data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = test_data.json; sourceTree = "<group>"; };
4559
1E00655427CFF7EB006FF6E9 /* CheetahAppTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CheetahAppTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
4660
1E00655727CFF7EB006FF6E9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4761
1E00655B27CFF7EB006FF6E9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -52,8 +66,6 @@
5266
1E00657427CFF7EC006FF6E9 /* CheetahAppTestUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CheetahAppTestUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5367
1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheetahAppTestUITests.swift; sourceTree = "<group>"; };
5468
1E00658827CFFA3C006FF6E9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
55-
1E00658927CFFAB3006FF6E9 /* test.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = test.wav; path = ../../../../resources/audio_samples/test.wav; sourceTree = "<group>"; };
56-
1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheetah_params.pv; path = ../../../../lib/common/cheetah_params.pv; sourceTree = "<group>"; };
5769
1E5B7B302800F6FE00F8BDDB /* PerformanceTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5870
1E5B7B322800F75900F8BDDB /* PerformanceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformanceTest.swift; sourceTree = "<group>"; };
5971
1E5B7B342800F76700F8BDDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -90,9 +102,47 @@
90102
/* End PBXFrameworksBuildPhase section */
91103

92104
/* Begin PBXGroup section */
105+
07E777C92D02632A005A41E7 /* audio_samples */ = {
106+
isa = PBXGroup;
107+
children = (
108+
07E777C32D02632A005A41E7 /* test.wav */,
109+
07E777C42D02632A005A41E7 /* test_de.wav */,
110+
07E777C52D02632A005A41E7 /* test_es.wav */,
111+
07E777C62D02632A005A41E7 /* test_fr.wav */,
112+
07E777C72D02632A005A41E7 /* test_it.wav */,
113+
07E777C82D02632A005A41E7 /* test_pt.wav */,
114+
);
115+
path = audio_samples;
116+
sourceTree = "<group>";
117+
};
118+
07E777D02D02632A005A41E7 /* model_files */ = {
119+
isa = PBXGroup;
120+
children = (
121+
07E777CA2D02632A005A41E7 /* cheetah_params.pv */,
122+
07E777CB2D02632A005A41E7 /* cheetah_params_de.pv */,
123+
07E777CC2D02632A005A41E7 /* cheetah_params_es.pv */,
124+
07E777CD2D02632A005A41E7 /* cheetah_params_fr.pv */,
125+
07E777CE2D02632A005A41E7 /* cheetah_params_it.pv */,
126+
07E777CF2D02632A005A41E7 /* cheetah_params_pt.pv */,
127+
);
128+
path = model_files;
129+
sourceTree = "<group>";
130+
};
131+
07E777D32D02632A005A41E7 /* test_resources */ = {
132+
isa = PBXGroup;
133+
children = (
134+
07E777C92D02632A005A41E7 /* audio_samples */,
135+
07E777D02D02632A005A41E7 /* model_files */,
136+
07E777D12D02632A005A41E7 /* .gitkeep */,
137+
07E777D22D02632A005A41E7 /* test_data.json */,
138+
);
139+
path = test_resources;
140+
sourceTree = "<group>";
141+
};
93142
1E00654B27CFF7EB006FF6E9 = {
94143
isa = PBXGroup;
95144
children = (
145+
072F6D482D02533000E29DF3 /* test_resources */,
96146
1E5B7B312800F71E00F8BDDB /* PerformanceTest */,
97147
1E00655627CFF7EB006FF6E9 /* CheetahAppTest */,
98148
1E00657727CFF7EC006FF6E9 /* CheetahAppTestUITests */,
@@ -127,8 +177,7 @@
127177
1E00657727CFF7EC006FF6E9 /* CheetahAppTestUITests */ = {
128178
isa = PBXGroup;
129179
children = (
130-
1E00658927CFFAB3006FF6E9 /* test.wav */,
131-
1E00658B27CFFABD006FF6E9 /* cheetah_params.pv */,
180+
07E777D32D02632A005A41E7 /* test_resources */,
132181
1E00657827CFF7EC006FF6E9 /* CheetahAppTestUITests.swift */,
133182
1E00658827CFFA3C006FF6E9 /* Info.plist */,
134183
);
@@ -242,7 +291,7 @@
242291
);
243292
mainGroup = 1E00654B27CFF7EB006FF6E9;
244293
packageReferences = (
245-
E15A377C2CF7B6D600A96F85 /* XCRemoteSwiftPackageReference "cheetah" */,
294+
07BA482F2D01233800A57078 /* XCLocalSwiftPackageReference "../../../../cheetah" */,
246295
);
247296
productRefGroup = 1E00655527CFF7EB006FF6E9 /* Products */;
248297
projectDirPath = "";
@@ -270,8 +319,7 @@
270319
isa = PBXResourcesBuildPhase;
271320
buildActionMask = 2147483647;
272321
files = (
273-
1E00658C27CFFABD006FF6E9 /* cheetah_params.pv in Resources */,
274-
1E00658A27CFFAB3006FF6E9 /* test.wav in Resources */,
322+
072F6D492D02533000E29DF3 /* test_resources in Resources */,
275323
);
276324
runOnlyForDeploymentPostprocessing = 0;
277325
};
@@ -524,7 +572,7 @@
524572
buildSettings = {
525573
CODE_SIGN_STYLE = Automatic;
526574
CURRENT_PROJECT_VERSION = 1;
527-
DEVELOPMENT_TEAM = 65723695GD;
575+
DEVELOPMENT_TEAM = 8TK4L7UF2X;
528576
GENERATE_INFOPLIST_FILE = YES;
529577
LD_RUNPATH_SEARCH_PATHS = (
530578
"$(inherited)",
@@ -546,7 +594,7 @@
546594
buildSettings = {
547595
CODE_SIGN_STYLE = Automatic;
548596
CURRENT_PROJECT_VERSION = 1;
549-
DEVELOPMENT_TEAM = 65723695GD;
597+
DEVELOPMENT_TEAM = 8TK4L7UF2X;
550598
GENERATE_INFOPLIST_FILE = YES;
551599
LD_RUNPATH_SEARCH_PATHS = (
552600
"$(inherited)",
@@ -652,23 +700,16 @@
652700
/* End XCConfigurationList section */
653701

654702
/* Begin XCLocalSwiftPackageReference section */
703+
07BA482F2D01233800A57078 /* XCLocalSwiftPackageReference "../../../../cheetah" */ = {
704+
isa = XCLocalSwiftPackageReference;
705+
relativePath = ../../../../cheetah;
706+
};
655707
E1E0C7FE2CF11FD9001D6D84 /* XCLocalSwiftPackageReference "../../../../cheetah" */ = {
656708
isa = XCLocalSwiftPackageReference;
657709
relativePath = ../../../../cheetah;
658710
};
659711
/* End XCLocalSwiftPackageReference section */
660712

661-
/* Begin XCRemoteSwiftPackageReference section */
662-
E15A377C2CF7B6D600A96F85 /* XCRemoteSwiftPackageReference "cheetah" */ = {
663-
isa = XCRemoteSwiftPackageReference;
664-
repositoryURL = "https://github.com/Picovoice/cheetah";
665-
requirement = {
666-
kind = exactVersion;
667-
version = 2.0.1;
668-
};
669-
};
670-
/* End XCRemoteSwiftPackageReference section */
671-
672713
/* Begin XCSwiftPackageProductDependency section */
673714
E1E0C8002CF120B0001D6D84 /* Cheetah */ = {
674715
isa = XCSwiftPackageProductDependency;

0 commit comments

Comments
 (0)