From 8f02e8fb9f34534cf6c93c682ed2c94bef1bef3b Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 14:13:15 -0700 Subject: [PATCH 01/11] handle apostrophes & quotes --- binding/ios/Orca-iOS.podspec | 4 ++-- binding/ios/Orca.swift | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/binding/ios/Orca-iOS.podspec b/binding/ios/Orca-iOS.podspec index af1a2ca3..950b7660 100644 --- a/binding/ios/Orca-iOS.podspec +++ b/binding/ios/Orca-iOS.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'Orca-iOS' s.module_name = 'Orca' - s.version = '0.2.1' + s.version = '0.2.2' s.license = {:type => 'Apache 2.0'} s.summary = 'iOS binding for Picovoice\'s Orca Text-to-Speech Engine.' s.description = @@ -18,7 +18,7 @@ Pod::Spec.new do |s| DESC s.homepage = 'https://github.com/Picovoice/orca/tree/main/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } - s.source = { :git => "https://github.com/Picovoice/orca.git", :tag => "Orca-iOS-v0.2.1" } + s.source = { :git => "https://github.com/Picovoice/orca.git", :branch => "ios-handle-apostrophes" } s.ios.deployment_target = '13.0' s.swift_version = '5.0' s.vendored_frameworks = 'lib/ios/PvOrca.xcframework' diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index 04cf5ea2..ece35e06 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -85,6 +85,15 @@ public class Orca { public static let version = String(cString: pv_orca_version()) private static var sdk = "ios" + + private func swapApostrophesAndQuotes(_ text: String) throws -> String { + var output = text + output = output.replacingOccurrences(of: "’", with: "'") + output = output.replacingOccurrences(of: "‘", with: "'") + output = output.replacingOccurrences(of: "“", with: "\"") + output = output.replacingOccurrences(of: "”", with: "\"") + return output + } /// OrcaStream object that converts a stream of text to a stream of audio. public class OrcaStream { @@ -115,10 +124,12 @@ public class Orca { var cNumSamples: Int32 = 0 var cPcm: UnsafeMutablePointer? + + var formattedText = swapApostrophesAndQuotes(text) let status = pv_orca_stream_synthesize( stream, - text, + formattedText, &cNumSamples, &cPcm) if status != PV_STATUS_SUCCESS { @@ -315,10 +326,12 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? + + var formattedText = swapApostrophesAndQuotes(text) let status = pv_orca_synthesize( handle, - text, + formattedText, cSynthesizeParams, &cNumSamples, &cPcm, From 8880b28049484af95e6db1c48c515ae76c29e4d9 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 15:23:52 -0700 Subject: [PATCH 02/11] rm throw, add quotes to valid characters --- binding/ios/Orca.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index ece35e06..59b92668 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -86,7 +86,7 @@ public class Orca { private static var sdk = "ios" - private func swapApostrophesAndQuotes(_ text: String) throws -> String { + private func swapApostrophesAndQuotes(_ text: String) -> String { var output = text output = output.replacingOccurrences(of: "’", with: "'") output = output.replacingOccurrences(of: "‘", with: "'") @@ -239,7 +239,7 @@ public class Orca { let messageStack = try getMessageStack() throw pvStatusToOrcaError(validCharactersStatus, "Unable to get Orca valid characters", messageStack) } - var validCharacters: Set = [] + var validCharacters: Set = ["‘", "’", "“", "”"] for i in 0.. Date: Wed, 5 Jun 2024 15:28:12 -0700 Subject: [PATCH 03/11] move helper function outside class --- binding/ios/Orca.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index 59b92668..dacab65d 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -69,6 +69,15 @@ public struct OrcaWord { } } +private func swapApostrophesAndQuotes(_ text: String) -> String { + var output = text + output = output.replacingOccurrences(of: "’", with: "'") + output = output.replacingOccurrences(of: "‘", with: "'") + output = output.replacingOccurrences(of: "“", with: "\"") + output = output.replacingOccurrences(of: "”", with: "\"") + return output +} + /// iOS (Swift) binding for Orca Text-to-Speech engine. Provides a Swift interface to the Orca library. public class Orca { @@ -85,15 +94,6 @@ public class Orca { public static let version = String(cString: pv_orca_version()) private static var sdk = "ios" - - private func swapApostrophesAndQuotes(_ text: String) -> String { - var output = text - output = output.replacingOccurrences(of: "’", with: "'") - output = output.replacingOccurrences(of: "‘", with: "'") - output = output.replacingOccurrences(of: "“", with: "\"") - output = output.replacingOccurrences(of: "”", with: "\"") - return output - } /// OrcaStream object that converts a stream of text to a stream of audio. public class OrcaStream { From 99a02b08e5748749efeca8ced0a48cac0156a058 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 15:34:46 -0700 Subject: [PATCH 04/11] fix synthesizeToFile --- binding/ios/Orca.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index dacab65d..5de2d64d 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -125,7 +125,7 @@ public class Orca { var cNumSamples: Int32 = 0 var cPcm: UnsafeMutablePointer? - var formattedText = swapApostrophesAndQuotes(text) + let formattedText = swapApostrophesAndQuotes(text) let status = pv_orca_stream_synthesize( stream, @@ -327,7 +327,7 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? - var formattedText = swapApostrophesAndQuotes(text) + let formattedText = swapApostrophesAndQuotes(text) let status = pv_orca_synthesize( handle, @@ -413,10 +413,12 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? + + let formattedText = swapApostrophesAndQuotes(text) let status = pv_orca_synthesize_to_file( handle, - text, + formattedText, cSynthesizeParams, outputPath, &cNumAlignments, From 077af72e059fe7489bba5c042dc640dd115a8ef6 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 16:36:39 -0700 Subject: [PATCH 05/11] minor - change fn name --- binding/ios/Orca.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index 5de2d64d..b4e9d19b 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -69,7 +69,7 @@ public struct OrcaWord { } } -private func swapApostrophesAndQuotes(_ text: String) -> String { +private func swapQuotes(_ text: String) -> String { var output = text output = output.replacingOccurrences(of: "’", with: "'") output = output.replacingOccurrences(of: "‘", with: "'") @@ -125,7 +125,7 @@ public class Orca { var cNumSamples: Int32 = 0 var cPcm: UnsafeMutablePointer? - let formattedText = swapApostrophesAndQuotes(text) + let formattedText = swapQuotes(text) let status = pv_orca_stream_synthesize( stream, @@ -327,7 +327,7 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? - let formattedText = swapApostrophesAndQuotes(text) + let formattedText = swapQuotes(text) let status = pv_orca_synthesize( handle, @@ -414,7 +414,7 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? - let formattedText = swapApostrophesAndQuotes(text) + let formattedText = swapQuotes(text) let status = pv_orca_synthesize_to_file( handle, From 5498a61e60b27691c930db7f376d26048609a13b Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 16:49:53 -0700 Subject: [PATCH 06/11] build --- .../OrcaAppTest.xcodeproj/project.pbxproj | 140 +++++++++--------- .../ios/OrcaAppTest/OrcaAppTest/Info.plist | 31 +--- .../OrcaAppTestUITests.swift | 66 ++++++++- binding/ios/OrcaAppTest/Podfile | 6 +- binding/ios/OrcaAppTest/Podfile.lock | 19 ++- .../OrcaDemo.xcodeproj/project.pbxproj | 68 ++++----- demo/ios/OrcaDemo/OrcaDemo/ContentView.swift | 6 +- demo/ios/OrcaDemo/Podfile | 2 +- demo/ios/OrcaDemo/Podfile.lock | 19 ++- 9 files changed, 198 insertions(+), 159 deletions(-) diff --git a/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj b/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj index 70a3fee5..99ba496d 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj +++ b/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj @@ -18,10 +18,10 @@ 1EAEDDE12B745E6A003B8C18 /* BaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAEDDDF2B745E6A003B8C18 /* BaseTest.swift */; }; 1EAEDDE32B76A9DB003B8C18 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 1EAEDDE22B76A9DB003B8C18 /* test_resources */; }; 1EAEDDE42B76A9DB003B8C18 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 1EAEDDE22B76A9DB003B8C18 /* test_resources */; }; - 64FC27AC17959BBA4AE1DBD6 /* libPods-PerformanceTest in Frameworks */ = {isa = PBXBuildFile; fileRef = 349FDD3404F2905A0BA99736 /* libPods-PerformanceTest.a */; }; - 6A9164E4B0B1626D27DBA0A1 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - 93824B093E1EA8686E508409 /* libPods-OrcaAppTestUITests in Frameworks */ = {isa = PBXBuildFile; fileRef = AA62EDF49CF52E816AEAC496 /* libPods-OrcaAppTestUITests.a */; }; - B1B274EA9E272F6464AE3268 /* libPods-OrcaAppTest in Frameworks */ = {isa = PBXBuildFile; fileRef = E00F84BC4EFB69CCFF671731 /* libPods-OrcaAppTest.a */; }; + 398230860C693EE18074B4E4 /* libPods-PerformanceTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */; }; + 6A9164E4B0B1626D27DBA0A1 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 6EDB547E13131239B7A0C256 /* libPods-OrcaAppTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */; }; + 75947425F67BD3CCA9DE06D6 /* libPods-OrcaAppTestUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,7 +42,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1729C092A21ACDBFA52E204D /* Pods-OrcaAppTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.release.xcconfig"; sourceTree = ""; }; 1E00644827CEDF9B006FF6E9 /* OrcaAppTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OrcaAppTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1E00644B27CEDF9B006FF6E9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 1E00644F27CEDF9B006FF6E9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -58,14 +57,15 @@ 1E5B7AEF2800B2E300F8BDDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 1EAEDDDF2B745E6A003B8C18 /* BaseTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTest.swift; sourceTree = ""; }; 1EAEDDE22B76A9DB003B8C18 /* test_resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = test_resources; sourceTree = ""; }; - 349FDD3404F2905A0BA99736 /* libPods-PerformanceTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PerformanceTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4890A9206235CFE3CE3B0C88 /* Pods-OrcaAppTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.debug.xcconfig"; sourceTree = ""; }; - 4A15EA34921845D659BA62CA /* Pods-OrcaAppTestUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.release.xcconfig"; sourceTree = ""; }; - 922323132BC788A1CD6F3501 /* Pods-PerformanceTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.debug.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.debug.xcconfig"; sourceTree = ""; }; - AA62EDF49CF52E816AEAC496 /* libPods-OrcaAppTestUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTestUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - BFFACEA23410F105A3EF7837 /* Pods-PerformanceTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.release.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.release.xcconfig"; sourceTree = ""; }; - E00F84BC4EFB69CCFF671731 /* libPods-OrcaAppTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E66BBC4B20DB6711B249BE25 /* Pods-OrcaAppTestUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.debug.xcconfig"; sourceTree = ""; }; + 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.release.xcconfig"; sourceTree = ""; }; + 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.release.xcconfig"; sourceTree = ""; }; + 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTestUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.debug.xcconfig"; sourceTree = ""; }; + 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.debug.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.debug.xcconfig"; sourceTree = ""; }; + E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PerformanceTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.release.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.release.xcconfig"; sourceTree = ""; }; + FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -73,7 +73,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B1B274EA9E272F6464AE3268 /* libPods-OrcaAppTest.a in Frameworks */, + 6EDB547E13131239B7A0C256 /* libPods-OrcaAppTest.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -81,8 +81,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6A9164E4B0B1626D27DBA0A1 /* BuildFile in Frameworks */, - 93824B093E1EA8686E508409 /* libPods-OrcaAppTestUITests.a in Frameworks */, + 6A9164E4B0B1626D27DBA0A1 /* (null) in Frameworks */, + 75947425F67BD3CCA9DE06D6 /* libPods-OrcaAppTestUITests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 64FC27AC17959BBA4AE1DBD6 /* libPods-PerformanceTest.a in Frameworks */, + 398230860C693EE18074B4E4 /* libPods-PerformanceTest.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -106,7 +106,7 @@ 1E00646B27CEDF9C006FF6E9 /* OrcaAppTestUITests */, 1E00644927CEDF9B006FF6E9 /* Products */, FA7D97C92E04F06D3273CCF3 /* Pods */, - 4349CC9BA9D88E3991B3CD30 /* Frameworks */, + 5E497E52AB2BDAF4D5EB3A65 /* Frameworks */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = PerformanceTest; sourceTree = ""; }; - 4349CC9BA9D88E3991B3CD30 /* Frameworks */ = { + 5E497E52AB2BDAF4D5EB3A65 /* Frameworks */ = { isa = PBXGroup; children = ( - E00F84BC4EFB69CCFF671731 /* libPods-OrcaAppTest.a */, - AA62EDF49CF52E816AEAC496 /* libPods-OrcaAppTestUITests.a */, - 349FDD3404F2905A0BA99736 /* libPods-PerformanceTest.a */, + 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */, + 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */, + E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */, ); name = Frameworks; sourceTree = ""; @@ -165,12 +165,12 @@ FA7D97C92E04F06D3273CCF3 /* Pods */ = { isa = PBXGroup; children = ( - 4890A9206235CFE3CE3B0C88 /* Pods-OrcaAppTest.debug.xcconfig */, - 1729C092A21ACDBFA52E204D /* Pods-OrcaAppTest.release.xcconfig */, - E66BBC4B20DB6711B249BE25 /* Pods-OrcaAppTestUITests.debug.xcconfig */, - 4A15EA34921845D659BA62CA /* Pods-OrcaAppTestUITests.release.xcconfig */, - 922323132BC788A1CD6F3501 /* Pods-PerformanceTest.debug.xcconfig */, - BFFACEA23410F105A3EF7837 /* Pods-PerformanceTest.release.xcconfig */, + FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */, + 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */, + 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */, + 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */, + 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */, + ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -182,11 +182,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E00647227CEDF9C006FF6E9 /* Build configuration list for PBXNativeTarget "OrcaAppTest" */; buildPhases = ( - 285C689B3A4EA9A591C9705C /* [CP] Check Pods Manifest.lock */, + 4BF0142C9C3502015795FB4D /* [CP] Check Pods Manifest.lock */, 1E00644427CEDF9B006FF6E9 /* Sources */, 1E00644527CEDF9B006FF6E9 /* Frameworks */, 1E00644627CEDF9B006FF6E9 /* Resources */, - A6B6BDB7682CC786D7EFE08C /* [CP] Embed Pods Frameworks */, + DE4329CA67792F90581C9112 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -201,11 +201,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E00647827CEDF9C006FF6E9 /* Build configuration list for PBXNativeTarget "OrcaAppTestUITests" */; buildPhases = ( - CB5CFC52439DE416D3C35DE4 /* [CP] Check Pods Manifest.lock */, + 38629059967196EFF566FB7F /* [CP] Check Pods Manifest.lock */, 1E00646427CEDF9C006FF6E9 /* Sources */, 1E00646527CEDF9C006FF6E9 /* Frameworks */, 1E00646627CEDF9C006FF6E9 /* Resources */, - 89D9AB15194F37A8E8266159 /* [CP] Embed Pods Frameworks */, + 58EF11789B4E191086638D6C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -221,11 +221,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E5B7AE92800B29F00F8BDDB /* Build configuration list for PBXNativeTarget "PerformanceTest" */; buildPhases = ( - 9A133E874B2D85B8ED96AD43 /* [CP] Check Pods Manifest.lock */, + 83257EE144D343B3D47A765B /* [CP] Check Pods Manifest.lock */, 1E5B7AE22800B29F00F8BDDB /* Sources */, 1E5B7AE42800B29F00F8BDDB /* Frameworks */, 1E5B7AE62800B29F00F8BDDB /* Resources */, - DE48BAF10F9710E09164428F /* [CP] Embed Pods Frameworks */, + 2F3EFDDBA2D68AFF59559B9E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -310,46 +310,46 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 285C689B3A4EA9A591C9705C /* [CP] Check Pods Manifest.lock */ = { + 2F3EFDDBA2D68AFF59559B9E /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaAppTest-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 89D9AB15194F37A8E8266159 /* [CP] Embed Pods Frameworks */ = { + 38629059967196EFF566FB7F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-OrcaAppTestUITests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9A133E874B2D85B8ED96AD43 /* [CP] Check Pods Manifest.lock */ = { + 4BF0142C9C3502015795FB4D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -364,31 +364,31 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PerformanceTest-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-OrcaAppTest-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A6B6BDB7682CC786D7EFE08C /* [CP] Embed Pods Frameworks */ = { + 58EF11789B4E191086638D6C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - CB5CFC52439DE416D3C35DE4 /* [CP] Check Pods Manifest.lock */ = { + 83257EE144D343B3D47A765B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -403,28 +403,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaAppTestUITests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-PerformanceTest-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DE48BAF10F9710E09164428F /* [CP] Embed Pods Frameworks */ = { + DE4329CA67792F90581C9112 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -608,7 +608,7 @@ }; 1E00647327CEDF9C006FF6E9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4890A9206235CFE3CE3B0C88 /* Pods-OrcaAppTest.debug.xcconfig */; + baseConfigurationReference = FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -639,13 +639,13 @@ }; 1E00647427CEDF9C006FF6E9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1729C092A21ACDBFA52E204D /* Pods-OrcaAppTest.release.xcconfig */; + baseConfigurationReference = 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 65723695GD; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OrcaAppTest/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OrcaDemoApp; @@ -670,7 +670,7 @@ }; 1E00647927CEDF9C006FF6E9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E66BBC4B20DB6711B249BE25 /* Pods-OrcaAppTestUITests.debug.xcconfig */; + baseConfigurationReference = 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -693,11 +693,11 @@ }; 1E00647A27CEDF9C006FF6E9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4A15EA34921845D659BA62CA /* Pods-OrcaAppTestUITests.release.xcconfig */; + baseConfigurationReference = 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 65723695GD; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -716,7 +716,7 @@ }; 1E5B7AEA2800B29F00F8BDDB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 922323132BC788A1CD6F3501 /* Pods-PerformanceTest.debug.xcconfig */; + baseConfigurationReference = 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; @@ -741,12 +741,12 @@ }; 1E5B7AEB2800B29F00F8BDDB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BFFACEA23410F105A3EF7837 /* Pods-PerformanceTest.release.xcconfig */; + baseConfigurationReference = ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 65723695GD; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist b/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist index 2ceba624..0c67376e 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist +++ b/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist @@ -1,34 +1,5 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - OrcaDemoApp - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - + diff --git a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift index 51171bcb..6ca87ca0 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift +++ b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift @@ -11,7 +11,7 @@ import XCTest import Orca class OrcaAppTestUITests: BaseTest { - + override func setUpWithError() throws { continueAfterFailure = true } @@ -34,6 +34,10 @@ class OrcaAppTestUITests: BaseTest { for orca in self.orcas { XCTAssertGreaterThan(orca.validCharacters!.count, 0) XCTAssert(orca.validCharacters!.contains(",")) + XCTAssert(orca.validCharacters!.contains("‘")) + XCTAssert(orca.validCharacters!.contains("’")) + XCTAssert(orca.validCharacters!.contains("“")) + XCTAssert(orca.validCharacters!.contains("”")) } } @@ -178,16 +182,72 @@ class OrcaAppTestUITests: BaseTest { let audioFile = audioDir.appendingPathComponent("test.wav") for orca in self.orcas { - try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputURL: audioFile) + let wordArrayFromURL = try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputURL: audioFile) XCTAssert(FileManager().fileExists(atPath: audioFile.path)) + XCTAssertGreaterThan(wordArrayFromURL.count, 0) try FileManager().removeItem(at: audioFile) - try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputPath: audioFile.path) + let wordArrayFromPath = try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputPath: audioFile.path) XCTAssert(FileManager().fileExists(atPath: audioFile.path)) + XCTAssertGreaterThan(wordArrayFromPath.count, 0) try FileManager().removeItem(at: audioFile) } } + + let textQuotes = "iOS uses different quotation marks for ‘single quotes’ and “double quotes” instead of the default ASCII ones." + + func testStreamingQuotes() throws { + for orca in self.orcas { + let orcaStream = try orca.streamOpen() + + var fullPcm = [Int16]() + for c in textQuotes { + if let pcm = try orcaStream.synthesize(text: String(c)) { + if !pcm.isEmpty { + fullPcm.append(contentsOf: pcm) + } + } + } + if let flushedPcm = try orcaStream.flush(), !flushedPcm.isEmpty { + fullPcm.append(contentsOf: flushedPcm) + } + + orcaStream.close() + XCTAssertGreaterThan(fullPcm.count, 0) + } + } + + func testSynthesizeQuotes() throws { + for orca in self.orcas { + let (pcm, wordArray) = try orca.synthesize( + text: textQuotes) + XCTAssertGreaterThan(pcm.count, 0) + XCTAssertGreaterThan(wordArray.count, 0) + } + } + + func testSynthesizeToFileQuotes() throws { + let audioDir = try FileManager.default.url( + for: .documentDirectory, + in: .userDomainMask, + appropriateFor: nil, + create: false) + let audioFile = audioDir.appendingPathComponent("test.wav") + + for orca in self.orcas { + let wordArrayFromURL = try orca.synthesizeToFile(text: textQuotes, outputURL: audioFile) + XCTAssert(FileManager().fileExists(atPath: audioFile.path)) + XCTAssertGreaterThan(wordArrayFromURL.count, 0) + try FileManager().removeItem(at: audioFile) + + let wordArrayFromPath = try orca.synthesizeToFile(text: textQuotes, outputPath: audioFile.path) + XCTAssert(FileManager().fileExists(atPath: audioFile.path)) + XCTAssertGreaterThan(wordArrayFromPath.count, 0) + try FileManager().removeItem(at: audioFile) + } + } + func testVersion() throws { XCTAssertGreaterThan(Orca.version.count, 0) } diff --git a/binding/ios/OrcaAppTest/Podfile b/binding/ios/OrcaAppTest/Podfile index 459d7a4e..b3a7b43b 100644 --- a/binding/ios/OrcaAppTest/Podfile +++ b/binding/ios/OrcaAppTest/Podfile @@ -2,13 +2,13 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'OrcaAppTest' do - pod 'Orca-iOS', '~> 0.2.1' + pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' end target 'OrcaAppTestUITests' do - pod 'Orca-iOS', '~> 0.2.1' + pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' end target 'PerformanceTest' do - pod 'Orca-iOS', '~> 0.2.1' + pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' end diff --git a/binding/ios/OrcaAppTest/Podfile.lock b/binding/ios/OrcaAppTest/Podfile.lock index d093fb4b..20070b6b 100644 --- a/binding/ios/OrcaAppTest/Podfile.lock +++ b/binding/ios/OrcaAppTest/Podfile.lock @@ -1,16 +1,21 @@ PODS: - - Orca-iOS (0.2.1) + - Orca-iOS (0.2.2) DEPENDENCIES: - - Orca-iOS (~> 0.2.1) + - Orca-iOS (from `https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec`) -SPEC REPOS: - trunk: - - Orca-iOS +EXTERNAL SOURCES: + Orca-iOS: + :podspec: https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec + +CHECKOUT OPTIONS: + Orca-iOS: + :commit: 99a02b08e5748749efeca8ced0a48cac0156a058 + :git: https://github.com/Picovoice/orca.git SPEC CHECKSUMS: - Orca-iOS: f6b6124d78189e26c8c0457022a5948217ebe2d3 + Orca-iOS: 22145f29e7845a6989a49eef7c794401fd217126 -PODFILE CHECKSUM: c74fc8347aa5171d01ba9ce86c96a401037847d4 +PODFILE CHECKSUM: 777ff7651d8e34fc9c126a2f1019ec9cf0e09560 COCOAPODS: 1.15.2 diff --git a/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj b/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj index d8b20fed..d4f2aba6 100644 --- a/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj +++ b/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -11,9 +11,9 @@ 02A1194B268D39A700A2AC99 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1194A268D39A700A2AC99 /* ContentView.swift */; }; 02A1194D268D39AB00A2AC99 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02A1194C268D39AB00A2AC99 /* Assets.xcassets */; }; 02A1195F268D3FD600A2AC99 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1195E268D3FD600A2AC99 /* ViewModel.swift */; }; + 0E4C868FC87CC8D8B5D6F7C8 /* libPods-OrcaDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */; }; 1E001B682B76FFE700D8E72D /* AudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E001B672B76FFE700D8E72D /* AudioPlayer.swift */; }; 1E001B6A2B7D451200D8E72D /* orca_params_female.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E001B692B7D451200D8E72D /* orca_params_female.pv */; }; - B218600C461D96EA568B6D6C /* libPods-OrcaDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E91B80C84BF594FCF1FCBD /* libPods-OrcaDemo.a */; }; E125E1892BE99DCA008B6D56 /* AtomicBool.swift in Sources */ = {isa = PBXBuildFile; fileRef = E125E1882BE99DCA008B6D56 /* AtomicBool.swift */; }; E1C5A45F2BE587A2002C0C40 /* AudioPlayerStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5A45E2BE587A2002C0C40 /* AudioPlayerStream.swift */; }; /* End PBXBuildFile section */ @@ -27,9 +27,9 @@ 02A1195E268D3FD600A2AC99 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = ""; }; 1E001B672B76FFE700D8E72D /* AudioPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = ""; }; 1E001B692B7D451200D8E72D /* orca_params_female.pv */ = {isa = PBXFileReference; lastKnownFileType = file; name = orca_params_female.pv; path = ../../../../lib/common/orca_params_female.pv; sourceTree = ""; }; - 2C3AE1B63A5DD37711F6DD7E /* Pods-OrcaDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.debug.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.debug.xcconfig"; sourceTree = ""; }; - 97762F0F3B18F16DC68C5D67 /* Pods-OrcaDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.release.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.release.xcconfig"; sourceTree = ""; }; - A9E91B80C84BF594FCF1FCBD /* libPods-OrcaDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.release.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.release.xcconfig"; sourceTree = ""; }; + B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.debug.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.debug.xcconfig"; sourceTree = ""; }; E125E1882BE99DCA008B6D56 /* AtomicBool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomicBool.swift; sourceTree = ""; }; E1C5A45E2BE587A2002C0C40 /* AudioPlayerStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerStream.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -39,7 +39,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B218600C461D96EA568B6D6C /* libPods-OrcaDemo.a in Frameworks */, + 0E4C868FC87CC8D8B5D6F7C8 /* libPods-OrcaDemo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -52,7 +52,7 @@ 02A11947268D39A700A2AC99 /* OrcaDemo */, 02A11946268D39A700A2AC99 /* Products */, 8DB92FF3DC81AB04D3FF7242 /* Pods */, - 4374BA75AB06EC0D059377CD /* Frameworks */, + A9EDD7D388908D989A16DD3B /* Frameworks */, ); sourceTree = ""; }; @@ -80,21 +80,21 @@ path = OrcaDemo; sourceTree = ""; }; - 4374BA75AB06EC0D059377CD /* Frameworks */ = { + 8DB92FF3DC81AB04D3FF7242 /* Pods */ = { isa = PBXGroup; children = ( - A9E91B80C84BF594FCF1FCBD /* libPods-OrcaDemo.a */, + B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */, + 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */, ); - name = Frameworks; + path = Pods; sourceTree = ""; }; - 8DB92FF3DC81AB04D3FF7242 /* Pods */ = { + A9EDD7D388908D989A16DD3B /* Frameworks */ = { isa = PBXGroup; children = ( - 2C3AE1B63A5DD37711F6DD7E /* Pods-OrcaDemo.debug.xcconfig */, - 97762F0F3B18F16DC68C5D67 /* Pods-OrcaDemo.release.xcconfig */, + 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */, ); - path = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -104,11 +104,11 @@ isa = PBXNativeTarget; buildConfigurationList = 02A11954268D39AB00A2AC99 /* Build configuration list for PBXNativeTarget "OrcaDemo" */; buildPhases = ( - E5EA3B129B59D3DF4752D82D /* [CP] Check Pods Manifest.lock */, + F5BF40EEECBF2D03B3E401C0 /* [CP] Check Pods Manifest.lock */, 02A11941268D39A700A2AC99 /* Sources */, 02A11942268D39A700A2AC99 /* Frameworks */, 02A11943268D39A700A2AC99 /* Resources */, - E85A144184F1D605DB772089 /* [CP] Embed Pods Frameworks */, + EE144A1AEF5967F9C2A22B79 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -134,7 +134,7 @@ }; }; buildConfigurationList = 02A11940268D39A700A2AC99 /* Build configuration list for PBXProject "OrcaDemo" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 15.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -164,43 +164,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - E5EA3B129B59D3DF4752D82D /* [CP] Check Pods Manifest.lock */ = { + EE144A1AEF5967F9C2A22B79 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaDemo-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E85A144184F1D605DB772089 /* [CP] Embed Pods Frameworks */ = { + F5BF40EEECBF2D03B3E401C0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-OrcaDemo-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -340,7 +340,7 @@ }; 02A11955268D39AB00A2AC99 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2C3AE1B63A5DD37711F6DD7E /* Pods-OrcaDemo.debug.xcconfig */; + baseConfigurationReference = B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -363,7 +363,7 @@ }; 02A11956268D39AB00A2AC99 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 97762F0F3B18F16DC68C5D67 /* Pods-OrcaDemo.release.xcconfig */; + baseConfigurationReference = 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; diff --git a/demo/ios/OrcaDemo/OrcaDemo/ContentView.swift b/demo/ios/OrcaDemo/OrcaDemo/ContentView.swift index cb53f8bf..38f1794a 100644 --- a/demo/ios/OrcaDemo/OrcaDemo/ContentView.swift +++ b/demo/ios/OrcaDemo/OrcaDemo/ContentView.swift @@ -70,10 +70,8 @@ struct ContentView: View { .font(.title3) .background(lightGray) .foregroundColor(Color.black) - .onChange(of: text) { newValue in - let updatedText = String( - newValue.prefix(Int(exactly: viewModel.maxCharacterLimit)!)) - text = updatedText.replacingOccurrences(of: "’", with: "'") + .onChange(of: text) { _ in + text = String(text.prefix(Int(exactly: viewModel.maxCharacterLimit)!)) viewModel.isValid(text: text) } .disabled(viewModel.state == .PLAYING) diff --git a/demo/ios/OrcaDemo/Podfile b/demo/ios/OrcaDemo/Podfile index 4599d72a..63ea342d 100644 --- a/demo/ios/OrcaDemo/Podfile +++ b/demo/ios/OrcaDemo/Podfile @@ -2,5 +2,5 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'OrcaDemo' do - pod 'Orca-iOS', '~> 0.2.1' + pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' end diff --git a/demo/ios/OrcaDemo/Podfile.lock b/demo/ios/OrcaDemo/Podfile.lock index 101c0c5d..80ab1e54 100644 --- a/demo/ios/OrcaDemo/Podfile.lock +++ b/demo/ios/OrcaDemo/Podfile.lock @@ -1,16 +1,21 @@ PODS: - - Orca-iOS (0.2.1) + - Orca-iOS (0.2.2) DEPENDENCIES: - - Orca-iOS (~> 0.2.1) + - Orca-iOS (from `https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec`) -SPEC REPOS: - trunk: - - Orca-iOS +EXTERNAL SOURCES: + Orca-iOS: + :podspec: https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec + +CHECKOUT OPTIONS: + Orca-iOS: + :commit: 99a02b08e5748749efeca8ced0a48cac0156a058 + :git: https://github.com/Picovoice/orca.git SPEC CHECKSUMS: - Orca-iOS: f6b6124d78189e26c8c0457022a5948217ebe2d3 + Orca-iOS: 22145f29e7845a6989a49eef7c794401fd217126 -PODFILE CHECKSUM: 652a0a00a9d97df5db1dd9d329fcda8f33faf935 +PODFILE CHECKSUM: d2c237e938fbaac1c6afe6c31bcc16ea301d49cf COCOAPODS: 1.15.2 From c9375dcbed189000693868a59ec6067b276598da Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 16:55:45 -0700 Subject: [PATCH 07/11] revert info --- .../ios/OrcaAppTest/OrcaAppTest/Info.plist | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist b/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist index 0c67376e..2ceba624 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist +++ b/binding/ios/OrcaAppTest/OrcaAppTest/Info.plist @@ -1,5 +1,34 @@ - + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + OrcaDemoApp + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + From 34b856dc4fd570820299ddd9dc6cd2da518bfcc6 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 5 Jun 2024 17:07:57 -0700 Subject: [PATCH 08/11] whitespace --- .../ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift index 6ca87ca0..f1a4fe09 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift +++ b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift @@ -11,7 +11,7 @@ import XCTest import Orca class OrcaAppTestUITests: BaseTest { - + override func setUpWithError() throws { continueAfterFailure = true } From 8bfece4bc558325c693b5139dc330c1a7fc2d0a6 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Thu, 6 Jun 2024 11:36:11 -0700 Subject: [PATCH 09/11] use tag --- binding/ios/Orca-iOS.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding/ios/Orca-iOS.podspec b/binding/ios/Orca-iOS.podspec index 950b7660..bf00e7ee 100644 --- a/binding/ios/Orca-iOS.podspec +++ b/binding/ios/Orca-iOS.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| DESC s.homepage = 'https://github.com/Picovoice/orca/tree/main/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } - s.source = { :git => "https://github.com/Picovoice/orca.git", :branch => "ios-handle-apostrophes" } + s.source = { :git => "https://github.com/Picovoice/orca.git", :tag => "Orca-iOS-v0.2.2" } s.ios.deployment_target = '13.0' s.swift_version = '5.0' s.vendored_frameworks = 'lib/ios/PvOrca.xcframework' From 52aaa9086867ccd39547bb85a6163f644ef6f05a Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Thu, 6 Jun 2024 12:05:28 -0700 Subject: [PATCH 10/11] lint --- binding/ios/Orca.swift | 6 +++--- .../OrcaAppTestUITests/OrcaAppTestUITests.swift | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/binding/ios/Orca.swift b/binding/ios/Orca.swift index b4e9d19b..5fa0202e 100644 --- a/binding/ios/Orca.swift +++ b/binding/ios/Orca.swift @@ -124,7 +124,7 @@ public class Orca { var cNumSamples: Int32 = 0 var cPcm: UnsafeMutablePointer? - + let formattedText = swapQuotes(text) let status = pv_orca_stream_synthesize( @@ -326,7 +326,7 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? - + let formattedText = swapQuotes(text) let status = pv_orca_synthesize( @@ -413,7 +413,7 @@ public class Orca { var cNumAlignments: Int32 = 0 var cAlignments: UnsafeMutablePointer?>? - + let formattedText = swapQuotes(text) let status = pv_orca_synthesize_to_file( diff --git a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift index f1a4fe09..2975517d 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift +++ b/binding/ios/OrcaAppTest/OrcaAppTestUITests/OrcaAppTestUITests.swift @@ -182,20 +182,23 @@ class OrcaAppTestUITests: BaseTest { let audioFile = audioDir.appendingPathComponent("test.wav") for orca in self.orcas { - let wordArrayFromURL = try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputURL: audioFile) + let wordArrayFromURL = try orca.synthesizeToFile( + text: self.testData!.test_sentences.text, outputURL: audioFile) XCTAssert(FileManager().fileExists(atPath: audioFile.path)) XCTAssertGreaterThan(wordArrayFromURL.count, 0) try FileManager().removeItem(at: audioFile) - let wordArrayFromPath = try orca.synthesizeToFile(text: self.testData!.test_sentences.text, outputPath: audioFile.path) + let wordArrayFromPath = try orca.synthesizeToFile( + text: self.testData!.test_sentences.text, outputPath: audioFile.path) XCTAssert(FileManager().fileExists(atPath: audioFile.path)) XCTAssertGreaterThan(wordArrayFromPath.count, 0) try FileManager().removeItem(at: audioFile) } } - - let textQuotes = "iOS uses different quotation marks for ‘single quotes’ and “double quotes” instead of the default ASCII ones." - + + let textQuotes = + "iOS uses different quotation marks for ‘single’ and “double” quotes." + func testStreamingQuotes() throws { for orca in self.orcas { let orcaStream = try orca.streamOpen() @@ -217,7 +220,7 @@ class OrcaAppTestUITests: BaseTest { XCTAssertGreaterThan(fullPcm.count, 0) } } - + func testSynthesizeQuotes() throws { for orca in self.orcas { let (pcm, wordArray) = try orca.synthesize( @@ -247,7 +250,7 @@ class OrcaAppTestUITests: BaseTest { try FileManager().removeItem(at: audioFile) } } - + func testVersion() throws { XCTAssertGreaterThan(Orca.version.count, 0) } From eed2f44aaf63d731de37279599f208f0b9ab0769 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Thu, 6 Jun 2024 14:36:20 -0700 Subject: [PATCH 11/11] post release --- .../OrcaAppTest.xcodeproj/project.pbxproj | 152 +++++++++--------- binding/ios/OrcaAppTest/Podfile | 6 +- binding/ios/OrcaAppTest/Podfile.lock | 17 +- .../OrcaDemo.xcodeproj/project.pbxproj | 58 +++---- demo/ios/OrcaDemo/Podfile | 2 +- demo/ios/OrcaDemo/Podfile.lock | 17 +- 6 files changed, 121 insertions(+), 131 deletions(-) diff --git a/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj b/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj index 99ba496d..26baa319 100644 --- a/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj +++ b/binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj @@ -18,10 +18,10 @@ 1EAEDDE12B745E6A003B8C18 /* BaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAEDDDF2B745E6A003B8C18 /* BaseTest.swift */; }; 1EAEDDE32B76A9DB003B8C18 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 1EAEDDE22B76A9DB003B8C18 /* test_resources */; }; 1EAEDDE42B76A9DB003B8C18 /* test_resources in Resources */ = {isa = PBXBuildFile; fileRef = 1EAEDDE22B76A9DB003B8C18 /* test_resources */; }; - 398230860C693EE18074B4E4 /* libPods-PerformanceTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */; }; - 6A9164E4B0B1626D27DBA0A1 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; - 6EDB547E13131239B7A0C256 /* libPods-OrcaAppTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */; }; - 75947425F67BD3CCA9DE06D6 /* libPods-OrcaAppTestUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */; }; + 23B5F83DEFB19D228DE964B8 /* libPods-OrcaAppTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F01EB231EDD1EF54AA07C62C /* libPods-OrcaAppTest.a */; }; + 6A9164E4B0B1626D27DBA0A1 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 70CF5248EFD5D183CEEBB51A /* libPods-OrcaAppTestUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 440AF0F30A0107761DEA641F /* libPods-OrcaAppTestUITests.a */; }; + B2192F48A17BAD6A0DB4A0B0 /* libPods-PerformanceTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7DF513036071631BBD968C8 /* libPods-PerformanceTest.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,6 +42,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1B750551FE4E12DD2BE3FFA9 /* Pods-OrcaAppTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.debug.xcconfig"; sourceTree = ""; }; 1E00644827CEDF9B006FF6E9 /* OrcaAppTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OrcaAppTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1E00644B27CEDF9B006FF6E9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 1E00644F27CEDF9B006FF6E9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -57,15 +58,14 @@ 1E5B7AEF2800B2E300F8BDDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 1EAEDDDF2B745E6A003B8C18 /* BaseTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTest.swift; sourceTree = ""; }; 1EAEDDE22B76A9DB003B8C18 /* test_resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = test_resources; sourceTree = ""; }; - 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.release.xcconfig"; sourceTree = ""; }; - 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.release.xcconfig"; sourceTree = ""; }; - 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTestUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.debug.xcconfig"; sourceTree = ""; }; - 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.debug.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.debug.xcconfig"; sourceTree = ""; }; - E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PerformanceTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.release.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.release.xcconfig"; sourceTree = ""; }; - FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.debug.xcconfig"; sourceTree = ""; }; + 2D8652DC4398EB65AEB7900E /* Pods-OrcaAppTestUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.debug.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.debug.xcconfig"; sourceTree = ""; }; + 440AF0F30A0107761DEA641F /* libPods-OrcaAppTestUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTestUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 51B364EA4D7DAB3E6FC8D40C /* Pods-OrcaAppTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTest.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest.release.xcconfig"; sourceTree = ""; }; + A7DF513036071631BBD968C8 /* libPods-PerformanceTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PerformanceTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + AB35F0D50B440E0DEA81B275 /* Pods-PerformanceTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.release.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.release.xcconfig"; sourceTree = ""; }; + B9AB5B0E3C3BF7A7E91A96C5 /* Pods-PerformanceTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PerformanceTest.debug.xcconfig"; path = "Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest.debug.xcconfig"; sourceTree = ""; }; + C776CEF0F990BBA66089391D /* Pods-OrcaAppTestUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaAppTestUITests.release.xcconfig"; path = "Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests.release.xcconfig"; sourceTree = ""; }; + F01EB231EDD1EF54AA07C62C /* libPods-OrcaAppTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaAppTest.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -73,7 +73,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6EDB547E13131239B7A0C256 /* libPods-OrcaAppTest.a in Frameworks */, + 23B5F83DEFB19D228DE964B8 /* libPods-OrcaAppTest.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -81,8 +81,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6A9164E4B0B1626D27DBA0A1 /* (null) in Frameworks */, - 75947425F67BD3CCA9DE06D6 /* libPods-OrcaAppTestUITests.a in Frameworks */, + 6A9164E4B0B1626D27DBA0A1 /* BuildFile in Frameworks */, + 70CF5248EFD5D183CEEBB51A /* libPods-OrcaAppTestUITests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 398230860C693EE18074B4E4 /* libPods-PerformanceTest.a in Frameworks */, + B2192F48A17BAD6A0DB4A0B0 /* libPods-PerformanceTest.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -106,7 +106,7 @@ 1E00646B27CEDF9C006FF6E9 /* OrcaAppTestUITests */, 1E00644927CEDF9B006FF6E9 /* Products */, FA7D97C92E04F06D3273CCF3 /* Pods */, - 5E497E52AB2BDAF4D5EB3A65 /* Frameworks */, + DE74BB91DE0DF6DC97C4AA8B /* Frameworks */, ); sourceTree = ""; }; @@ -152,12 +152,12 @@ path = PerformanceTest; sourceTree = ""; }; - 5E497E52AB2BDAF4D5EB3A65 /* Frameworks */ = { + DE74BB91DE0DF6DC97C4AA8B /* Frameworks */ = { isa = PBXGroup; children = ( - 36C6B90F0DD4688B00BF5BD1 /* libPods-OrcaAppTest.a */, - 58446C38CF44ECA5BE736D6C /* libPods-OrcaAppTestUITests.a */, - E3552928B12C34659E72F41A /* libPods-PerformanceTest.a */, + F01EB231EDD1EF54AA07C62C /* libPods-OrcaAppTest.a */, + 440AF0F30A0107761DEA641F /* libPods-OrcaAppTestUITests.a */, + A7DF513036071631BBD968C8 /* libPods-PerformanceTest.a */, ); name = Frameworks; sourceTree = ""; @@ -165,12 +165,12 @@ FA7D97C92E04F06D3273CCF3 /* Pods */ = { isa = PBXGroup; children = ( - FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */, - 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */, - 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */, - 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */, - 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */, - ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */, + 1B750551FE4E12DD2BE3FFA9 /* Pods-OrcaAppTest.debug.xcconfig */, + 51B364EA4D7DAB3E6FC8D40C /* Pods-OrcaAppTest.release.xcconfig */, + 2D8652DC4398EB65AEB7900E /* Pods-OrcaAppTestUITests.debug.xcconfig */, + C776CEF0F990BBA66089391D /* Pods-OrcaAppTestUITests.release.xcconfig */, + B9AB5B0E3C3BF7A7E91A96C5 /* Pods-PerformanceTest.debug.xcconfig */, + AB35F0D50B440E0DEA81B275 /* Pods-PerformanceTest.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -182,11 +182,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E00647227CEDF9C006FF6E9 /* Build configuration list for PBXNativeTarget "OrcaAppTest" */; buildPhases = ( - 4BF0142C9C3502015795FB4D /* [CP] Check Pods Manifest.lock */, + 98B5787CA085209AE3EC7CD3 /* [CP] Check Pods Manifest.lock */, 1E00644427CEDF9B006FF6E9 /* Sources */, 1E00644527CEDF9B006FF6E9 /* Frameworks */, 1E00644627CEDF9B006FF6E9 /* Resources */, - DE4329CA67792F90581C9112 /* [CP] Embed Pods Frameworks */, + 75C82358FB8F66E328C28F61 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -201,11 +201,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E00647827CEDF9C006FF6E9 /* Build configuration list for PBXNativeTarget "OrcaAppTestUITests" */; buildPhases = ( - 38629059967196EFF566FB7F /* [CP] Check Pods Manifest.lock */, + 16FE6459EB7B2322302675E0 /* [CP] Check Pods Manifest.lock */, 1E00646427CEDF9C006FF6E9 /* Sources */, 1E00646527CEDF9C006FF6E9 /* Frameworks */, 1E00646627CEDF9C006FF6E9 /* Resources */, - 58EF11789B4E191086638D6C /* [CP] Embed Pods Frameworks */, + 1E76A1239325D01476848FE0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -221,11 +221,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1E5B7AE92800B29F00F8BDDB /* Build configuration list for PBXNativeTarget "PerformanceTest" */; buildPhases = ( - 83257EE144D343B3D47A765B /* [CP] Check Pods Manifest.lock */, + 7873D3E06BCE81EB49116FB2 /* [CP] Check Pods Manifest.lock */, 1E5B7AE22800B29F00F8BDDB /* Sources */, 1E5B7AE42800B29F00F8BDDB /* Frameworks */, 1E5B7AE62800B29F00F8BDDB /* Resources */, - 2F3EFDDBA2D68AFF59559B9E /* [CP] Embed Pods Frameworks */, + 9E515F735608EDEA67AFAB7D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -310,85 +310,85 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2F3EFDDBA2D68AFF59559B9E /* [CP] Embed Pods Frameworks */ = { + 16FE6459EB7B2322302675E0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-OrcaAppTestUITests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 38629059967196EFF566FB7F /* [CP] Check Pods Manifest.lock */ = { + 1E76A1239325D01476848FE0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaAppTestUITests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 4BF0142C9C3502015795FB4D /* [CP] Check Pods Manifest.lock */ = { + 75C82358FB8F66E328C28F61 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaAppTest-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 58EF11789B4E191086638D6C /* [CP] Embed Pods Frameworks */ = { + 7873D3E06BCE81EB49116FB2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PerformanceTest-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTestUITests/Pods-OrcaAppTestUITests-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 83257EE144D343B3D47A765B /* [CP] Check Pods Manifest.lock */ = { + 98B5787CA085209AE3EC7CD3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -403,28 +403,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PerformanceTest-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-OrcaAppTest-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DE4329CA67792F90581C9112 /* [CP] Embed Pods Frameworks */ = { + 9E515F735608EDEA67AFAB7D /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaAppTest/Pods-OrcaAppTest-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PerformanceTest/Pods-PerformanceTest-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -608,7 +608,7 @@ }; 1E00647327CEDF9C006FF6E9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FE7B6B92A661A3F221A50728 /* Pods-OrcaAppTest.debug.xcconfig */; + baseConfigurationReference = 1B750551FE4E12DD2BE3FFA9 /* Pods-OrcaAppTest.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -639,7 +639,7 @@ }; 1E00647427CEDF9C006FF6E9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4607588D9CCE07448B7BA516 /* Pods-OrcaAppTest.release.xcconfig */; + baseConfigurationReference = 51B364EA4D7DAB3E6FC8D40C /* Pods-OrcaAppTest.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -670,7 +670,7 @@ }; 1E00647927CEDF9C006FF6E9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5B60259D664C95F3DAE60374 /* Pods-OrcaAppTestUITests.debug.xcconfig */; + baseConfigurationReference = 2D8652DC4398EB65AEB7900E /* Pods-OrcaAppTestUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -693,7 +693,7 @@ }; 1E00647A27CEDF9C006FF6E9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3B791DA614C047E7DDFEB6C4 /* Pods-OrcaAppTestUITests.release.xcconfig */; + baseConfigurationReference = C776CEF0F990BBA66089391D /* Pods-OrcaAppTestUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -716,7 +716,7 @@ }; 1E5B7AEA2800B29F00F8BDDB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 675DC1ABFC743D5EC599057F /* Pods-PerformanceTest.debug.xcconfig */; + baseConfigurationReference = B9AB5B0E3C3BF7A7E91A96C5 /* Pods-PerformanceTest.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; @@ -741,7 +741,7 @@ }; 1E5B7AEB2800B29F00F8BDDB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED99AA130BE6AA0A0632768C /* Pods-PerformanceTest.release.xcconfig */; + baseConfigurationReference = AB35F0D50B440E0DEA81B275 /* Pods-PerformanceTest.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; diff --git a/binding/ios/OrcaAppTest/Podfile b/binding/ios/OrcaAppTest/Podfile index b3a7b43b..78f09ebd 100644 --- a/binding/ios/OrcaAppTest/Podfile +++ b/binding/ios/OrcaAppTest/Podfile @@ -2,13 +2,13 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'OrcaAppTest' do - pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' + pod 'Orca-iOS', '~> 0.2.2' end target 'OrcaAppTestUITests' do - pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' + pod 'Orca-iOS', '~> 0.2.2' end target 'PerformanceTest' do - pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' + pod 'Orca-iOS', '~> 0.2.2' end diff --git a/binding/ios/OrcaAppTest/Podfile.lock b/binding/ios/OrcaAppTest/Podfile.lock index 20070b6b..bf25bff4 100644 --- a/binding/ios/OrcaAppTest/Podfile.lock +++ b/binding/ios/OrcaAppTest/Podfile.lock @@ -2,20 +2,15 @@ PODS: - Orca-iOS (0.2.2) DEPENDENCIES: - - Orca-iOS (from `https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec`) + - Orca-iOS (~> 0.2.2) -EXTERNAL SOURCES: - Orca-iOS: - :podspec: https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec - -CHECKOUT OPTIONS: - Orca-iOS: - :commit: 99a02b08e5748749efeca8ced0a48cac0156a058 - :git: https://github.com/Picovoice/orca.git +SPEC REPOS: + trunk: + - Orca-iOS SPEC CHECKSUMS: - Orca-iOS: 22145f29e7845a6989a49eef7c794401fd217126 + Orca-iOS: 567ca0e53671d8fc28ba15338db8fe4ff5101d8d -PODFILE CHECKSUM: 777ff7651d8e34fc9c126a2f1019ec9cf0e09560 +PODFILE CHECKSUM: 2deb98490df78cf895d797180dcfeccea4f2ad25 COCOAPODS: 1.15.2 diff --git a/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj b/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj index d4f2aba6..e0c91c4e 100644 --- a/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj +++ b/demo/ios/OrcaDemo/OrcaDemo.xcodeproj/project.pbxproj @@ -11,9 +11,9 @@ 02A1194B268D39A700A2AC99 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1194A268D39A700A2AC99 /* ContentView.swift */; }; 02A1194D268D39AB00A2AC99 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02A1194C268D39AB00A2AC99 /* Assets.xcassets */; }; 02A1195F268D3FD600A2AC99 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1195E268D3FD600A2AC99 /* ViewModel.swift */; }; - 0E4C868FC87CC8D8B5D6F7C8 /* libPods-OrcaDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */; }; 1E001B682B76FFE700D8E72D /* AudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E001B672B76FFE700D8E72D /* AudioPlayer.swift */; }; 1E001B6A2B7D451200D8E72D /* orca_params_female.pv in Resources */ = {isa = PBXBuildFile; fileRef = 1E001B692B7D451200D8E72D /* orca_params_female.pv */; }; + 93BE66087E58F64A2193D44C /* libPods-OrcaDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6293833704AEC548A02FB651 /* libPods-OrcaDemo.a */; }; E125E1892BE99DCA008B6D56 /* AtomicBool.swift in Sources */ = {isa = PBXBuildFile; fileRef = E125E1882BE99DCA008B6D56 /* AtomicBool.swift */; }; E1C5A45F2BE587A2002C0C40 /* AudioPlayerStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5A45E2BE587A2002C0C40 /* AudioPlayerStream.swift */; }; /* End PBXBuildFile section */ @@ -25,11 +25,11 @@ 02A1194C268D39AB00A2AC99 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 02A11951268D39AB00A2AC99 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 02A1195E268D3FD600A2AC99 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = ""; }; + 1C5DAA8ED5D246C3A58AA45B /* Pods-OrcaDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.release.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.release.xcconfig"; sourceTree = ""; }; 1E001B672B76FFE700D8E72D /* AudioPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = ""; }; 1E001B692B7D451200D8E72D /* orca_params_female.pv */ = {isa = PBXFileReference; lastKnownFileType = file; name = orca_params_female.pv; path = ../../../../lib/common/orca_params_female.pv; sourceTree = ""; }; - 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.release.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.release.xcconfig"; sourceTree = ""; }; - B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.debug.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.debug.xcconfig"; sourceTree = ""; }; + 3B38AA40E88807F9C21BFD02 /* Pods-OrcaDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrcaDemo.debug.xcconfig"; path = "Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo.debug.xcconfig"; sourceTree = ""; }; + 6293833704AEC548A02FB651 /* libPods-OrcaDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrcaDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E125E1882BE99DCA008B6D56 /* AtomicBool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomicBool.swift; sourceTree = ""; }; E1C5A45E2BE587A2002C0C40 /* AudioPlayerStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerStream.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -39,7 +39,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0E4C868FC87CC8D8B5D6F7C8 /* libPods-OrcaDemo.a in Frameworks */, + 93BE66087E58F64A2193D44C /* libPods-OrcaDemo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -52,7 +52,7 @@ 02A11947268D39A700A2AC99 /* OrcaDemo */, 02A11946268D39A700A2AC99 /* Products */, 8DB92FF3DC81AB04D3FF7242 /* Pods */, - A9EDD7D388908D989A16DD3B /* Frameworks */, + D4BC0C682CB4645A73894BC8 /* Frameworks */, ); sourceTree = ""; }; @@ -83,16 +83,16 @@ 8DB92FF3DC81AB04D3FF7242 /* Pods */ = { isa = PBXGroup; children = ( - B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */, - 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */, + 3B38AA40E88807F9C21BFD02 /* Pods-OrcaDemo.debug.xcconfig */, + 1C5DAA8ED5D246C3A58AA45B /* Pods-OrcaDemo.release.xcconfig */, ); path = Pods; sourceTree = ""; }; - A9EDD7D388908D989A16DD3B /* Frameworks */ = { + D4BC0C682CB4645A73894BC8 /* Frameworks */ = { isa = PBXGroup; children = ( - 4FF94FCA7900409CAB4C9019 /* libPods-OrcaDemo.a */, + 6293833704AEC548A02FB651 /* libPods-OrcaDemo.a */, ); name = Frameworks; sourceTree = ""; @@ -104,11 +104,11 @@ isa = PBXNativeTarget; buildConfigurationList = 02A11954268D39AB00A2AC99 /* Build configuration list for PBXNativeTarget "OrcaDemo" */; buildPhases = ( - F5BF40EEECBF2D03B3E401C0 /* [CP] Check Pods Manifest.lock */, + 953F197786B352AA828626D7 /* [CP] Check Pods Manifest.lock */, 02A11941268D39A700A2AC99 /* Sources */, 02A11942268D39A700A2AC99 /* Frameworks */, 02A11943268D39A700A2AC99 /* Resources */, - EE144A1AEF5967F9C2A22B79 /* [CP] Embed Pods Frameworks */, + C4DE16407A77E6DE174EE4DB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -164,43 +164,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - EE144A1AEF5967F9C2A22B79 /* [CP] Embed Pods Frameworks */ = { + 953F197786B352AA828626D7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-OrcaDemo-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F5BF40EEECBF2D03B3E401C0 /* [CP] Check Pods Manifest.lock */ = { + C4DE16407A77E6DE174EE4DB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OrcaDemo-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrcaDemo/Pods-OrcaDemo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -340,7 +340,7 @@ }; 02A11955268D39AB00A2AC99 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B9F7F370B37AD23ED8588225 /* Pods-OrcaDemo.debug.xcconfig */; + baseConfigurationReference = 3B38AA40E88807F9C21BFD02 /* Pods-OrcaDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -363,7 +363,7 @@ }; 02A11956268D39AB00A2AC99 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7992D0D1A458A83C060AD8D2 /* Pods-OrcaDemo.release.xcconfig */; + baseConfigurationReference = 1C5DAA8ED5D246C3A58AA45B /* Pods-OrcaDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; diff --git a/demo/ios/OrcaDemo/Podfile b/demo/ios/OrcaDemo/Podfile index 63ea342d..67f72677 100644 --- a/demo/ios/OrcaDemo/Podfile +++ b/demo/ios/OrcaDemo/Podfile @@ -2,5 +2,5 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'OrcaDemo' do - pod 'Orca-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec' + pod 'Orca-iOS', '~> 0.2.2' end diff --git a/demo/ios/OrcaDemo/Podfile.lock b/demo/ios/OrcaDemo/Podfile.lock index 80ab1e54..958988c5 100644 --- a/demo/ios/OrcaDemo/Podfile.lock +++ b/demo/ios/OrcaDemo/Podfile.lock @@ -2,20 +2,15 @@ PODS: - Orca-iOS (0.2.2) DEPENDENCIES: - - Orca-iOS (from `https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec`) + - Orca-iOS (~> 0.2.2) -EXTERNAL SOURCES: - Orca-iOS: - :podspec: https://raw.githubusercontent.com/Picovoice/orca/ios-handle-apostrophes/binding/ios/Orca-iOS.podspec - -CHECKOUT OPTIONS: - Orca-iOS: - :commit: 99a02b08e5748749efeca8ced0a48cac0156a058 - :git: https://github.com/Picovoice/orca.git +SPEC REPOS: + trunk: + - Orca-iOS SPEC CHECKSUMS: - Orca-iOS: 22145f29e7845a6989a49eef7c794401fd217126 + Orca-iOS: 567ca0e53671d8fc28ba15338db8fe4ff5101d8d -PODFILE CHECKSUM: d2c237e938fbaac1c6afe6c31bcc16ea301d49cf +PODFILE CHECKSUM: 118fa8c1767dd3edcc2ec366a16ab74191c6176c COCOAPODS: 1.15.2