Skip to content

Commit bcb7ae6

Browse files
AppDevGuyAppDevGuy
authored
Merge pull request #35 from AppDevGuy/v0.3.3_develop
v0.3.3 Release
2 parents c1ead5e + 1cad9fe commit bcb7ae6

52 files changed

Lines changed: 536 additions & 269 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/swift.yml‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,31 @@ name: Swift
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

9+
#list of jobs to perform
910
jobs:
10-
test:
11-
name: Test
12-
runs-on: macOS-latest
13-
11+
#the only job in the list, named `build`
12+
build_and_test:
13+
#specify OS to run the jobs on
14+
runs-on: macos-latest
15+
#sequential steps to run for the `build` job
1416
steps:
15-
- uses: actions/checkout@v2
16-
- name: Build and Test
17+
# step 1, use Marketplace action called Checkout@v2, to checkout the code
18+
- uses: actions/checkout@v2 #'uses' keyword launches the Marketplace action
19+
# step 2, verbosely build the package using the `swift` CLI
20+
- name: Build
21+
run: swift build -v #'run' keyword executes the command, as if it's run in terminal
22+
# step 3, run tests
23+
# Note that you must use "=" and not ":" despite error logs for -destiation using ":"
24+
# Also using "Any iOS Simulator" doesn't seem to work despite being an option.
25+
# The using CODE_SIGN... and beyond are for Codecov purposes when generating results.
26+
- name: Run tests
1727
run: |
18-
cd Example
19-
pod install
20-
xcodebuild clean test -workspace OSSSpeechKit.xcworkspace -scheme OSSSpeechKit-Example -destination "platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro Max" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
21-
bash <(curl https://codecov.io/bash | sed 's/"$beta_xcode_partials"//g')
22-
env:
23-
destination: "platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro Max"
28+
cd Example
29+
pod install
30+
xcodebuild clean test -scheme OSSSpeechKit-Example -workspace OSSSpeechKit.xcworkspace -destination 'platform=iOS Simulator,OS=16.2,name=iPhone 14' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
31+
bash <(curl https://codecov.io/bash | sed 's/"$beta_xcode_partials"//g')
32+

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Check Travis CI version info:
22
# https://docs.travis-ci.com/user/reference/osx/
33
language: objective-c
4-
osx_image: xcode11.3
4+
osx_image: xcode14.2
55
xcode_workspace: OSSSpeechKit.xcworkspace
66
xcode_scheme: OSSSpeechKit-Example
7-
xcode_destination: platform=iOS Simulator,OS=13.3,name=iPhone 11
7+
xcode_destination: platform=iOS Simulator,OS=16.2,name=iPhone 14
88
before_install:
9-
- cd Example
10-
- pod install
9+
- cd Example
10+
- pod install
1111
after_success:
12-
# - bash <(curl -s https://codecov.io/bash)
13-
# Fixing code cov issue with solution from https://community.codecov.io/t/llvm-cov-failed-to-produce-results-for/1652/9
12+
# - bash <(curl -s https://codecov.io/bash)
13+
# Fixing code cov issue with solution from https://community.codecov.io/t/llvm-cov-failed-to-produce-results-for/1652/9
1414
- bash <(curl https://codecov.io/bash | sed 's/"$beta_xcode_partials"//g')
1515
- gem install jazzy
1616
- make documentation

‎Example/OSSSpeechKit.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -186,7 +186,7 @@
186186
607FACCD1AFB9204008FA782 /* Frameworks */,
187187
607FACCE1AFB9204008FA782 /* Resources */,
188188
5004C6A87EB6F934EFA310F2 /* [CP] Embed Pods Frameworks */,
189-
B042F2D2245FCDD900958719 /* ShellScript */,
189+
B042F2D2245FCDD900958719 /* Run Script */,
190190
);
191191
buildRules = (
192192
);
@@ -223,7 +223,7 @@
223223
isa = PBXProject;
224224
attributes = {
225225
LastSwiftUpdateCheck = 1140;
226-
LastUpgradeCheck = 1130;
226+
LastUpgradeCheck = 1420;
227227
ORGANIZATIONNAME = CocoaPods;
228228
TargetAttributes = {
229229
607FACCF1AFB9204008FA782 = {
@@ -287,34 +287,34 @@
287287
inputPaths = (
288288
"${PODS_ROOT}/Target Support Files/Pods-OSSSpeechKit_Example/Pods-OSSSpeechKit_Example-frameworks.sh",
289289
"${BUILT_PRODUCTS_DIR}/OSSSpeechKit/OSSSpeechKit.framework",
290-
"${BUILT_PRODUCTS_DIR}/PureLayout/PureLayout.framework",
291290
);
292291
name = "[CP] Embed Pods Frameworks";
293292
outputPaths = (
294293
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OSSSpeechKit.framework",
295-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PureLayout.framework",
296294
);
297295
runOnlyForDeploymentPostprocessing = 0;
298296
shellPath = /bin/sh;
299297
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OSSSpeechKit_Example/Pods-OSSSpeechKit_Example-frameworks.sh\"\n";
300298
showEnvVarsInLog = 0;
301299
};
302-
B042F2D2245FCDD900958719 /* ShellScript */ = {
300+
B042F2D2245FCDD900958719 /* Run Script */ = {
303301
isa = PBXShellScriptBuildPhase;
302+
alwaysOutOfDate = 1;
304303
buildActionMask = 2147483647;
305304
files = (
306305
);
307306
inputFileListPaths = (
308307
);
309308
inputPaths = (
310309
);
310+
name = "Run Script";
311311
outputFileListPaths = (
312312
);
313313
outputPaths = (
314314
);
315315
runOnlyForDeploymentPostprocessing = 0;
316316
shellPath = /bin/sh;
317-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
317+
shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
318318
};
319319
EBB80964F428049277FF60C0 /* [CP] Check Pods Manifest.lock */ = {
320320
isa = PBXShellScriptBuildPhase;
@@ -428,6 +428,7 @@
428428
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
429429
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
430430
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
431+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
431432
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
432433
CLANG_WARN_STRICT_PROTOTYPES = YES;
433434
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -453,7 +454,7 @@
453454
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
454455
GCC_WARN_UNUSED_FUNCTION = YES;
455456
GCC_WARN_UNUSED_VARIABLE = YES;
456-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
457+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
457458
MTL_ENABLE_DEBUG_INFO = YES;
458459
ONLY_ACTIVE_ARCH = YES;
459460
SDKROOT = iphoneos;
@@ -484,6 +485,7 @@
484485
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
485486
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
486487
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
488+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
487489
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
488490
CLANG_WARN_STRICT_PROTOTYPES = YES;
489491
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -503,10 +505,9 @@
503505
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
504506
GCC_WARN_UNUSED_FUNCTION = YES;
505507
GCC_WARN_UNUSED_VARIABLE = YES;
506-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
508+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
507509
MTL_ENABLE_DEBUG_INFO = NO;
508510
SDKROOT = iphoneos;
509-
SWIFT_COMPILATION_MODE = wholemodule;
510511
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
511512
VALIDATE_PRODUCT = YES;
512513
};
@@ -522,8 +523,11 @@
522523
DEVELOPMENT_TEAM = "";
523524
GCC_OPTIMIZATION_LEVEL = 0;
524525
INFOPLIST_FILE = OSSSpeechKit/Info.plist;
525-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
526-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
526+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
527+
LD_RUNPATH_SEARCH_PATHS = (
528+
"$(inherited)",
529+
"@executable_path/Frameworks",
530+
);
527531
MODULE_NAME = ExampleApp;
528532
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
529533
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -543,8 +547,11 @@
543547
DEVELOPMENT_TEAM = "";
544548
GCC_OPTIMIZATION_LEVEL = 0;
545549
INFOPLIST_FILE = OSSSpeechKit/Info.plist;
546-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
547-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
550+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
551+
LD_RUNPATH_SEARCH_PATHS = (
552+
"$(inherited)",
553+
"@executable_path/Frameworks",
554+
);
548555
MODULE_NAME = ExampleApp;
549556
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
550557
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -571,7 +578,12 @@
571578
"$(inherited)",
572579
);
573580
INFOPLIST_FILE = Tests/Info.plist;
574-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
581+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
582+
LD_RUNPATH_SEARCH_PATHS = (
583+
"$(inherited)",
584+
"@executable_path/Frameworks",
585+
"@loader_path/Frameworks",
586+
);
575587
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
576588
PRODUCT_NAME = "$(TARGET_NAME)";
577589
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -594,7 +606,12 @@
594606
);
595607
GCC_OPTIMIZATION_LEVEL = 0;
596608
INFOPLIST_FILE = Tests/Info.plist;
597-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
609+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
610+
LD_RUNPATH_SEARCH_PATHS = (
611+
"$(inherited)",
612+
"@executable_path/Frameworks",
613+
"@loader_path/Frameworks",
614+
);
598615
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
599616
PRODUCT_NAME = "$(TARGET_NAME)";
600617
PROVISIONING_PROFILE_SPECIFIER = "";

‎Example/OSSSpeechKit.xcodeproj/xcshareddata/xcschemes/OSSSpeechKit-Example.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1420"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/OSSSpeechKit/CountryLanguageListTableViewController.swift‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@ class CountryLanguageListTableViewController: UITableViewController {
2929
// MARK: - Variables
3030

3131
private let speechKit = OSSSpeech.shared
32-
32+
3333
private lazy var microphoneButton: UIBarButtonItem = {
3434
var micImage: UIImage?
35-
if #available(iOS 13.0, *) {
36-
micImage = UIImage(systemName: "mic.fill")?.withRenderingMode(.alwaysTemplate)
37-
} else {
38-
micImage = UIImage(named: "oss-microphone-icon")?.withRenderingMode(.alwaysTemplate)
39-
}
35+
micImage = UIImage(systemName: "mic.fill")?.withRenderingMode(.alwaysTemplate)
4036
let button = UIBarButtonItem(image: micImage, style: .plain, target: self, action: #selector(recordVoice))
41-
button.tintColor = .black
37+
button.tintColor = .label
4238
button.accessibilityIdentifier = "OSSSpeechKitMicButton"
4339
return button
4440
}()
@@ -58,13 +54,24 @@ class CountryLanguageListTableViewController: UITableViewController {
5854
// MARK: - Voice Recording
5955

6056
@objc func recordVoice() {
61-
if microphoneButton.tintColor == .red {
57+
shoudlStartRecordingVoice(microphoneButton.tintColor != .red)
58+
}
59+
60+
private func shoudlStartRecordingVoice(_ shouldRecord: Bool) {
61+
updateMicButtonColor(forState: shouldRecord)
62+
if !shouldRecord {
6263
speechKit.endVoiceRecording()
6364
return
6465
}
65-
microphoneButton.tintColor = .red
6666
speechKit.recordVoice()
6767
}
68+
69+
func updateMicButtonColor(forState isRecording: Bool) {
70+
DispatchQueue.main.async { [weak self] in
71+
guard let self else { return }
72+
self.microphoneButton.tintColor = isRecording ? .red : .label
73+
}
74+
}
6875
}
6976

7077
extension CountryLanguageListTableViewController {
@@ -111,7 +118,7 @@ extension CountryLanguageListTableViewController: OSSSpeechDelegate {
111118
}
112119

113120
func didFailToProcessRequest(withError error: Error?) {
114-
recordVoice()
121+
shoudlStartRecordingVoice(false)
115122
guard let err = error else {
116123
print("Error with the request but the error returned is nil")
117124
return
@@ -125,14 +132,13 @@ extension CountryLanguageListTableViewController: OSSSpeechDelegate {
125132

126133
func didFailToCommenceSpeechRecording() {
127134
print("Failed to record speech.")
128-
recordVoice()
135+
shoudlStartRecordingVoice(false)
129136
}
130137

131138
func didFinishListening(withText text: String) {
132-
weak var weakSelf = self
133-
OperationQueue.main.addOperation {
134-
weakSelf?.microphoneButton.tintColor = .black
135-
weakSelf?.speechKit.speakText(text)
139+
OperationQueue.main.addOperation { [weak self] in
140+
self?.updateMicButtonColor(forState: false)
141+
self?.speechKit.speakText(text)
136142
}
137143
}
138144
}

‎Example/Podfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
use_frameworks!
2-
platform :ios, '12.0'
2+
platform :ios, '13.0'
33

44
target 'OSSSpeechKit_Example' do
55
pod 'OSSSpeechKit', :path => '../'
6-
pod 'PureLayout', :inhibit_warnings => true
7-
6+
87
target 'OSSSpeechKit_Tests' do
98
inherit! :search_paths
109

‎Example/Podfile.lock‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
PODS:
2+
- OSSSpeechKit (0.3.3)
3+
4+
DEPENDENCIES:
5+
- OSSSpeechKit (from `../`)
6+
7+
EXTERNAL SOURCES:
8+
OSSSpeechKit:
9+
:path: "../"
10+
11+
SPEC CHECKSUMS:
12+
OSSSpeechKit: ea0fd8151e7e338bc6ddc6bb749455fc3b33cfde
13+
14+
PODFILE CHECKSUM: 619c7767d93bbf8bc7a5c2d0a1d118e435561c49
15+
16+
COCOAPODS: 1.11.3

0 commit comments

Comments
 (0)