From fec24bd70966c4904503f0b3d4be638d9f396ab1 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Mon, 2 Dec 2024 11:17:08 -0800 Subject: [PATCH] try fix --- .github/workflows/ios-browserstack.yml | 8 +------ .github/workflows/ios-perf.yml | 8 +------ Package.swift | 4 ++-- .../EagleAppTest.xcodeproj/project.pbxproj | 22 ++++++------------- binding/ios/EagleAppTest/Podfile.lock | 16 -------------- demo/ios/EagleDemo/EagleDemo/ViewModel.swift | 16 +++++++------- demo/ios/EagleDemo/Podfile.lock | 20 ----------------- resources/.lint/spell-check/dict.txt | 1 + 8 files changed, 20 insertions(+), 75 deletions(-) delete mode 100644 binding/ios/EagleAppTest/Podfile.lock delete mode 100644 demo/ios/EagleDemo/Podfile.lock diff --git a/.github/workflows/ios-browserstack.yml b/.github/workflows/ios-browserstack.yml index 58c44f8..c239eaa 100644 --- a/.github/workflows/ios-browserstack.yml +++ b/.github/workflows/ios-browserstack.yml @@ -35,18 +35,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}}:' EagleAppTestUITests/BaseTest.swift @@ -54,7 +48,7 @@ jobs: - name: XCode Build run: xcrun xcodebuild build-for-testing -configuration Debug - -workspace EagleAppTest.xcworkspace + -project EagleAppTest.xcodeproj -sdk iphoneos -scheme EagleAppTest -derivedDataPath ddp diff --git a/.github/workflows/ios-perf.yml b/.github/workflows/ios-perf.yml index d5e0cb4..f3aee61 100644 --- a/.github/workflows/ios-perf.yml +++ b/.github/workflows/ios-perf.yml @@ -43,18 +43,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}}:' PerformanceTest/PerformanceTest.swift @@ -76,7 +70,7 @@ jobs: - name: XCode Build run: xcrun xcodebuild build-for-testing -configuration Debug - -workspace EagleAppTest.xcworkspace + -project EagleAppTest.xcodeproj -sdk iphoneos -scheme PerformanceTest -derivedDataPath ddp diff --git a/Package.swift b/Package.swift index 296a180..4af7348 100644 --- a/Package.swift +++ b/Package.swift @@ -29,11 +29,11 @@ let package = Package( "binding/ios/EagleBase.swift", "binding/ios/EagleErrors.swift", "binding/ios/EagleProfile.swift", - "binding/ios/EagleProfiler.swift", + "binding/ios/EagleProfiler.swift" ], resources: [ .copy("lib/common/eagle_params.pv") ] ) ] -) \ No newline at end of file +) diff --git a/binding/ios/EagleAppTest/EagleAppTest.xcodeproj/project.pbxproj b/binding/ios/EagleAppTest/EagleAppTest.xcodeproj/project.pbxproj index f9d5b60..61b7961 100644 --- a/binding/ios/EagleAppTest/EagleAppTest.xcodeproj/project.pbxproj +++ b/binding/ios/EagleAppTest/EagleAppTest.xcodeproj/project.pbxproj @@ -14,7 +14,7 @@ 1E0064D427CEEA66006FF6E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E0064D227CEEA66006FF6E9 /* LaunchScreen.storyboard */; }; 1E00654627CFF260006FF6E9 /* EagleAppTestUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0064E827CEEA66006FF6E9 /* EagleAppTestUITests.swift */; }; 1E5B7B042800D9BE00F8BDDB /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5B7B032800D9BE00F8BDDB /* PerformanceTest.swift */; }; - 36696536961DE78B3E1C06FA /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 36696536961DE78B3E1C06FA /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; C757D8CD28A1C77100F391C8 /* BaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C757D8CB28A1C77100F391C8 /* BaseTest.swift */; }; C790A6FB2A2012C40074FF7A /* audio_samples in Resources */ = {isa = PBXBuildFile; fileRef = C790A6FA2A2012C40074FF7A /* audio_samples */; }; C790A6FC2A2012C40074FF7A /* audio_samples in Resources */ = {isa = PBXBuildFile; fileRef = C790A6FA2A2012C40074FF7A /* audio_samples */; }; @@ -71,7 +71,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 36696536961DE78B3E1C06FA /* (null) in Frameworks */, + 36696536961DE78B3E1C06FA /* BuildFile in Frameworks */, E17FFF062CFE3B4300AA5CA9 /* Eagle in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -93,7 +93,6 @@ 1E5B7B022800D9A500F8BDDB /* PerformanceTest */, 1E0064C627CEEA65006FF6E9 /* EagleAppTest */, 1E0064E727CEEA66006FF6E9 /* EagleAppTestUITests */, - E17FFF022CFE3B3E00AA5CA9 /* Frameworks */, 1E0064C527CEEA65006FF6E9 /* Products */, ); sourceTree = ""; @@ -141,13 +140,6 @@ path = PerformanceTest; sourceTree = ""; }; - E17FFF022CFE3B3E00AA5CA9 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -237,7 +229,7 @@ ); mainGroup = 1E0064BB27CEEA65006FF6E9; packageReferences = ( - E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "../../../../eagle" */, + E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "eagle" */, ); productRefGroup = 1E0064C527CEEA65006FF6E9 /* Products */; projectDirPath = ""; @@ -652,7 +644,7 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "../../../../eagle" */ = { + E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "eagle" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../../../../eagle; }; @@ -661,17 +653,17 @@ /* Begin XCSwiftPackageProductDependency section */ E17FFF032CFE3B3E00AA5CA9 /* Eagle */ = { isa = XCSwiftPackageProductDependency; - package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "../../../../eagle" */; + package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "eagle" */; productName = Eagle; }; E17FFF052CFE3B4300AA5CA9 /* Eagle */ = { isa = XCSwiftPackageProductDependency; - package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "../../../../eagle" */; + package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "eagle" */; productName = Eagle; }; E17FFF072CFE3B4600AA5CA9 /* Eagle */ = { isa = XCSwiftPackageProductDependency; - package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "../../../../eagle" */; + package = E17FFF012CFE3B3200AA5CA9 /* XCLocalSwiftPackageReference "eagle" */; productName = Eagle; }; /* End XCSwiftPackageProductDependency section */ diff --git a/binding/ios/EagleAppTest/Podfile.lock b/binding/ios/EagleAppTest/Podfile.lock deleted file mode 100644 index 4f51c67..0000000 --- a/binding/ios/EagleAppTest/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - Eagle-iOS (1.0.1) - -DEPENDENCIES: - - Eagle-iOS (~> 1.0.1) - -SPEC REPOS: - trunk: - - Eagle-iOS - -SPEC CHECKSUMS: - Eagle-iOS: 998181609f97849b323023c3ed3d3fbb369ece2a - -PODFILE CHECKSUM: 32252195e8a4e7b7e29caf8a647533d7585f75e0 - -COCOAPODS: 1.16.2 diff --git a/demo/ios/EagleDemo/EagleDemo/ViewModel.swift b/demo/ios/EagleDemo/EagleDemo/ViewModel.swift index fcb867d..f588994 100644 --- a/demo/ios/EagleDemo/EagleDemo/ViewModel.swift +++ b/demo/ios/EagleDemo/EagleDemo/ViewModel.swift @@ -27,7 +27,7 @@ class ViewModel: ObservableObject { private var testListener: VoiceProcessorFrameListener? private var errorListener: VoiceProcessorErrorListener? private var testErrorListener: VoiceProcessorErrorListener? - + private var eagleProfiler: EagleProfiler! private var eagle: Eagle! @@ -76,7 +76,7 @@ class ViewModel: ObservableObject { do { try eagleProfiler = EagleProfiler(accessKey: accessKey) statusText = "Please keep speaking until the enrollment percentage reaches 100%" - + try createDumpFile(filename: "enroll_dump.pcm") } catch let error as EagleInvalidArgumentError { errorMessage = "\(error.localizedDescription)" @@ -96,7 +96,7 @@ class ViewModel: ObservableObject { public func enroll() throws { state = UIState.ENROLLING initProfiler() - + self.errorListener = VoiceProcessorErrorListener({ error in self.errorMessage = "\(error)" }) @@ -128,7 +128,7 @@ class ViewModel: ObservableObject { try? self.stopEnroll() } }) - + VoiceProcessor.instance.addErrorListener(self.errorListener!) VoiceProcessor.instance.addFrameListener(self.frameListener!) @@ -147,7 +147,7 @@ class ViewModel: ObservableObject { private func stopEnroll(export: Bool = false) throws { VoiceProcessor.instance.removeErrorListener(errorListener!) VoiceProcessor.instance.removeFrameListener(frameListener!) - + if VoiceProcessor.instance.numFrameListeners == 0 { do { try VoiceProcessor.instance.stop() @@ -155,7 +155,7 @@ class ViewModel: ObservableObject { throw EagleError(error.localizedDescription) } } - + if export == true { let newProfile = try eagleProfiler.export() DispatchQueue.main.async { @@ -199,7 +199,7 @@ class ViewModel: ObservableObject { try? self.stopTest() } }) - + try createDumpFile(filename: "test_dump.pcm") } catch let error as EagleInvalidArgumentError { errorMessage = "\(error.localizedDescription)" @@ -243,7 +243,7 @@ class ViewModel: ObservableObject { throw EagleError(error.localizedDescription) } } - + if eagle != nil { eagle.delete() eagle = nil diff --git a/demo/ios/EagleDemo/Podfile.lock b/demo/ios/EagleDemo/Podfile.lock deleted file mode 100644 index fd69ee7..0000000 --- a/demo/ios/EagleDemo/Podfile.lock +++ /dev/null @@ -1,20 +0,0 @@ -PODS: - - Eagle-iOS (1.0.1) - - ios-voice-processor (1.0.3) - -DEPENDENCIES: - - Eagle-iOS (~> 1.0.1) - - ios-voice-processor (~> 1.0.3) - -SPEC REPOS: - trunk: - - Eagle-iOS - - ios-voice-processor - -SPEC CHECKSUMS: - Eagle-iOS: 998181609f97849b323023c3ed3d3fbb369ece2a - ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc - -PODFILE CHECKSUM: 6fdf5a2d8316e8b741e0a468bda00174e72c4499 - -COCOAPODS: 1.16.2 diff --git a/resources/.lint/spell-check/dict.txt b/resources/.lint/spell-check/dict.txt index 2609cc7..9df15f0 100644 --- a/resources/.lint/spell-check/dict.txt +++ b/resources/.lint/spell-check/dict.txt @@ -30,6 +30,7 @@ wavefile wchars wfopen xcframework +xcodeproj xcuitest xcworkspace malloc