From 58de943b4333a6972c43b2018299a99c55f38ae5 Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Fri, 26 Jan 2024 15:30:16 -0800 Subject: [PATCH 1/3] podspec --- binding/ios/Eagle-iOS.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binding/ios/Eagle-iOS.podspec b/binding/ios/Eagle-iOS.podspec index 1e419a2..44d71af 100644 --- a/binding/ios/Eagle-iOS.podspec +++ b/binding/ios/Eagle-iOS.podspec @@ -1,17 +1,17 @@ Pod::Spec.new do |s| s.name = 'Eagle-iOS' s.module_name = 'Eagle' - s.version = '0.2.0' + s.version = '1.0.0' s.license = {:type => 'Apache 2.0'} s.summary = 'iOS binding for Picovoice\'s Eagle speaker recognition engine' s.description = <<-DESC - Eagle Speaker Recognition is speaker verification and identification software + Eagle Speaker Recognition is speaker verification and identification software that distinguishes individuals using their unique voice characteristics. DESC s.homepage = 'https://github.com/Picovoice/eagle/tree/master/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } - s.source = { :git => "https://github.com/Picovoice/eagle.git", :tag => "Eagle-iOS-v0.2.0" } + s.source = { :git => "https://github.com/Picovoice/eagle.git", :tag => "Eagle-iOS-v1.0.0" } s.ios.deployment_target = '13.0' s.swift_version = '5.0' s.vendored_frameworks = 'lib/ios/PvEagle.xcframework' From 1f1c2a0b69f397da0f465645e0f6c1f8e27fc65f Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Fri, 26 Jan 2024 15:38:26 -0800 Subject: [PATCH 2/3] fix headers --- .../ios-arm64/PvEagle.framework/Headers/picovoice.h | 2 ++ .../PvEagle.framework/Headers/picovoice.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/ios/PvEagle.xcframework/ios-arm64/PvEagle.framework/Headers/picovoice.h b/lib/ios/PvEagle.xcframework/ios-arm64/PvEagle.framework/Headers/picovoice.h index 886558d..3f13d70 100644 --- a/lib/ios/PvEagle.xcframework/ios-arm64/PvEagle.framework/Headers/picovoice.h +++ b/lib/ios/PvEagle.xcframework/ios-arm64/PvEagle.framework/Headers/picovoice.h @@ -77,6 +77,8 @@ PV_API pv_status_t pv_get_error_stack( */ PV_API void pv_free_error_stack(char **message_stack); +PV_API void pv_set_sdk(const char *sdk); + #ifdef __cplusplus } diff --git a/lib/ios/PvEagle.xcframework/ios-arm64_x86_64-simulator/PvEagle.framework/Headers/picovoice.h b/lib/ios/PvEagle.xcframework/ios-arm64_x86_64-simulator/PvEagle.framework/Headers/picovoice.h index 886558d..3f13d70 100644 --- a/lib/ios/PvEagle.xcframework/ios-arm64_x86_64-simulator/PvEagle.framework/Headers/picovoice.h +++ b/lib/ios/PvEagle.xcframework/ios-arm64_x86_64-simulator/PvEagle.framework/Headers/picovoice.h @@ -77,6 +77,8 @@ PV_API pv_status_t pv_get_error_stack( */ PV_API void pv_free_error_stack(char **message_stack); +PV_API void pv_set_sdk(const char *sdk); + #ifdef __cplusplus } From 8c4818b494588c243993a907a2f7bf09e89165e7 Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Fri, 26 Jan 2024 15:51:00 -0800 Subject: [PATCH 3/3] update demos and tests --- .../EagleAppTestUITests.swift | 22 +------------------ binding/ios/EagleAppTest/Podfile | 6 ++--- binding/ios/EagleAppTest/Podfile.lock | 14 ++++++------ demo/ios/EagleDemo/Podfile | 2 +- demo/ios/EagleDemo/Podfile.lock | 13 ++++++----- 5 files changed, 20 insertions(+), 37 deletions(-) diff --git a/binding/ios/EagleAppTest/EagleAppTestUITests/EagleAppTestUITests.swift b/binding/ios/EagleAppTest/EagleAppTestUITests/EagleAppTestUITests.swift index 6a35c8f..f3e51ce 100644 --- a/binding/ios/EagleAppTest/EagleAppTestUITests/EagleAppTestUITests.swift +++ b/binding/ios/EagleAppTest/EagleAppTestUITests/EagleAppTestUITests.swift @@ -1,5 +1,5 @@ // -// Copyright 2023 Picovoice Inc. +// Copyright 2023-2024 Picovoice Inc. // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" // file accompanying this source. // Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on @@ -64,26 +64,6 @@ class EagleAppTestUITests: BaseTest { eagleProfiler.delete() } - func testEagleEnrollmentUnknownSpeaker() throws { - let enrollUrls = enrollUrls() - let imposterUrl = imposterUrl() - - var feedback: EagleProfilerEnrollFeedback? - - let eagleProfiler = try EagleProfiler(accessKey: accessKey) - for url in enrollUrls { - let pcm = try readPcmFromFile(testAudioURL: url) - (_, feedback) = try eagleProfiler.enroll(pcm: pcm) - XCTAssertEqual(feedback, EagleProfilerEnrollFeedback.AUDIO_OK) - } - - let pcm = try readPcmFromFile(testAudioURL: imposterUrl) - (_, feedback) = try eagleProfiler.enroll(pcm: pcm) - XCTAssertEqual(feedback, EagleProfilerEnrollFeedback.UNKNOWN_SPEAKER) - - eagleProfiler.delete() - } - func testEagleProcess() throws { let testUrl = testUrl() diff --git a/binding/ios/EagleAppTest/Podfile b/binding/ios/EagleAppTest/Podfile index 80101d2..e48c66b 100644 --- a/binding/ios/EagleAppTest/Podfile +++ b/binding/ios/EagleAppTest/Podfile @@ -2,13 +2,13 @@ source 'https://cdn.cocoapods.org/' platform :ios, '13.0' target 'EagleAppTest' do - pod 'Eagle-iOS', '~> 0.2.0' + pod 'Eagle-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec' end target 'EagleAppTestUITests' do - pod 'Eagle-iOS', '~> 0.2.0' + pod 'Eagle-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec' end target 'PerformanceTest' do - pod 'Eagle-iOS', '~> 0.2.0' + pod 'Eagle-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec' end diff --git a/binding/ios/EagleAppTest/Podfile.lock b/binding/ios/EagleAppTest/Podfile.lock index e0ab13a..bfee7ca 100644 --- a/binding/ios/EagleAppTest/Podfile.lock +++ b/binding/ios/EagleAppTest/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Eagle-iOS (0.2.0) + - Eagle-iOS (1.0.0) DEPENDENCIES: - - Eagle-iOS (~> 0.2.0) + - Eagle-iOS (from `https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec`) -SPEC REPOS: - trunk: - - Eagle-iOS +EXTERNAL SOURCES: + Eagle-iOS: + :podspec: https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec SPEC CHECKSUMS: - Eagle-iOS: 4d73249948537760d43a71d133e36f4dab62baf1 + Eagle-iOS: 02067133a7460faf56e0ef7b995c93543a8e0450 -PODFILE CHECKSUM: 437084df4c8d112faabf682827d3b9f36717574b +PODFILE CHECKSUM: 6644ab972ff7cbe5e822a55d57563e985d138f9f COCOAPODS: 1.11.3 diff --git a/demo/ios/EagleDemo/Podfile b/demo/ios/EagleDemo/Podfile index 9962da5..a098096 100644 --- a/demo/ios/EagleDemo/Podfile +++ b/demo/ios/EagleDemo/Podfile @@ -2,6 +2,6 @@ source 'https://cdn.cocoapods.org/' platform :ios, '14.0' target 'EagleDemo' do - pod 'Eagle-iOS', '~> 0.2.0' + pod 'Eagle-iOS', :podspec => 'https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec' pod 'ios-voice-processor', '~> 1.0.3' end diff --git a/demo/ios/EagleDemo/Podfile.lock b/demo/ios/EagleDemo/Podfile.lock index ad38b45..3fe540c 100644 --- a/demo/ios/EagleDemo/Podfile.lock +++ b/demo/ios/EagleDemo/Podfile.lock @@ -1,20 +1,23 @@ PODS: - - Eagle-iOS (0.2.0) + - Eagle-iOS (1.0.0) - ios-voice-processor (1.0.3) DEPENDENCIES: - - Eagle-iOS (~> 0.2.0) + - Eagle-iOS (from `https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec`) - ios-voice-processor (~> 1.0.3) SPEC REPOS: trunk: - - Eagle-iOS - ios-voice-processor +EXTERNAL SOURCES: + Eagle-iOS: + :podspec: https://raw.githubusercontent.com/Picovoice/eagle/v1.0-ios/binding/ios/Eagle-iOS.podspec + SPEC CHECKSUMS: - Eagle-iOS: 4d73249948537760d43a71d133e36f4dab62baf1 + Eagle-iOS: 02067133a7460faf56e0ef7b995c93543a8e0450 ios-voice-processor: 65b25a8db69ea25ffba0eeef37bae71a982f34cc -PODFILE CHECKSUM: 856dca93ab6416a5a8c6da6952dc2a955fea9e4f +PODFILE CHECKSUM: 80fbe8e61cae033b91409ea1ad086ff95a210ead COCOAPODS: 1.11.3