From 9bdc55c12ee9a30553187d109697b2af967778a9 Mon Sep 17 00:00:00 2001 From: Abhash Kumar Singh Date: Mon, 13 Jan 2025 11:47:51 -0800 Subject: [PATCH] chore: update amplify dependency to 2.45.4 (#190) * chore: update amplify dependency to 2.45.4 * switch to xcbeautify * update destination iPhone version --- .../composite_actions/run_xcodebuild/action.yml | 2 +- .../run_xcodebuild_test/action.yml | 2 +- .github/workflows/build_liveness.yml | 2 +- .github/workflows/liveness_unit_tests.yml | 2 +- .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++-------- HostApp/HostApp/HostAppApp.swift | 1 + HostApp/HostApp/Views/ExampleLivenessView.swift | 8 ++++++-- Package.resolved | 16 ++++++++-------- Package.swift | 2 +- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/composite_actions/run_xcodebuild/action.yml b/.github/composite_actions/run_xcodebuild/action.yml index 223bdf9e..e66f40cb 100644 --- a/.github/composite_actions/run_xcodebuild/action.yml +++ b/.github/composite_actions/run_xcodebuild/action.yml @@ -40,5 +40,5 @@ runs: sudo xcode-select -s $XCODE_PATH fi xcodebuild -version - xcodebuild build -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' ${{ inputs.other_flags }} | xcpretty --simple --color --report junit && exit ${PIPESTATUS[0]} + xcodebuild build -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' ${{ inputs.other_flags }} | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]} shell: bash \ No newline at end of file diff --git a/.github/composite_actions/run_xcodebuild_test/action.yml b/.github/composite_actions/run_xcodebuild_test/action.yml index bb93371c..e83fa68e 100644 --- a/.github/composite_actions/run_xcodebuild_test/action.yml +++ b/.github/composite_actions/run_xcodebuild_test/action.yml @@ -53,7 +53,7 @@ runs: fi xcode-select -p xcodebuild -version - xcodebuild test -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' ${{ inputs.other_flags }} $coverageFlags | xcpretty --simple --color --report junit && exit ${PIPESTATUS[0]} + xcodebuild test -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' ${{ inputs.other_flags }} $coverageFlags | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]} shell: bash - name: Generate Coverage report diff --git a/.github/workflows/build_liveness.yml b/.github/workflows/build_liveness.yml index 564caad7..06463bdf 100644 --- a/.github/workflows/build_liveness.yml +++ b/.github/workflows/build_liveness.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/composite_actions/run_xcodebuild with: scheme: FaceLiveness - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 15,OS=latest' confirm-pass: runs-on: ubuntu-latest diff --git a/.github/workflows/liveness_unit_tests.yml b/.github/workflows/liveness_unit_tests.yml index 4d082429..b6b62af0 100644 --- a/.github/workflows/liveness_unit_tests.yml +++ b/.github/workflows/liveness_unit_tests.yml @@ -27,5 +27,5 @@ jobs: with: scheme: FaceLiveness token: ${{ secrets.CODECOV_TOKEN }} - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 15,OS=latest' generate_coverage: true \ No newline at end of file diff --git a/HostApp/HostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/HostApp/HostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8694f40a..1977045a 100644 --- a/HostApp/HostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/HostApp/HostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/aws-amplify/amplify-swift", "state" : { - "revision" : "95d8f16780c4e11a243fdae93c386195347aea66", - "version" : "2.42.1" + "revision" : "7b1d5ee05a23ea24c7458dffed1c563c8501042d", + "version" : "2.45.4" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-crt-swift", "state" : { - "revision" : "7b42e0343f28b3451aab20840dc670abd12790bd", - "version" : "0.36.0" + "revision" : "3f844bef042cc0a4c3381f7090414ce3f9a7e935", + "version" : "0.37.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-sdk-swift.git", "state" : { - "revision" : "828358a2c39d138325b0f87a2d813f4b972e5f4f", - "version" : "1.0.0" + "revision" : "c6c1064da9bfccb119a7a8ab9ba636fb3bbfa6f5", + "version" : "1.0.47" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/smithy-lang/smithy-swift", "state" : { - "revision" : "0ed3440f8c41e27a0937364d5035d2d4fefb8aa3", - "version" : "0.71.0" + "revision" : "3cd9f181b3ba8ff71da43bf53c09f8de6790a4ad", + "version" : "0.96.0" } }, { diff --git a/HostApp/HostApp/HostAppApp.swift b/HostApp/HostApp/HostAppApp.swift index 21b409f5..61863c5c 100644 --- a/HostApp/HostApp/HostAppApp.swift +++ b/HostApp/HostApp/HostAppApp.swift @@ -27,6 +27,7 @@ struct HostAppApp: App { init() { do { + Amplify.Logging.logLevel = .verbose let auth = AWSCognitoAuthPlugin() let api = AWSAPIPlugin() try Amplify.add(plugin: auth) diff --git a/HostApp/HostApp/Views/ExampleLivenessView.swift b/HostApp/HostApp/Views/ExampleLivenessView.swift index f24045d4..5f6868b6 100644 --- a/HostApp/HostApp/Views/ExampleLivenessView.swift +++ b/HostApp/HostApp/Views/ExampleLivenessView.swift @@ -48,8 +48,12 @@ struct ExampleLivenessView: View { viewModel.presentationState = .error(.invalidSignature) case .failure(.cameraNotAvailable): viewModel.presentationState = .error(.cameraNotAvailable) - default: - viewModel.presentationState = .liveness + case .failure(.validation): + viewModel.presentationState = .error(.validation) + case .failure(.faceInOvalMatchExceededTimeLimitError): + viewModel.presentationState = .error(.faceInOvalMatchExceededTimeLimitError) + case .failure(_): + viewModel.presentationState = .error(.unknown) } } } diff --git a/Package.resolved b/Package.resolved index 8694f40a..1977045a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/aws-amplify/amplify-swift", "state" : { - "revision" : "95d8f16780c4e11a243fdae93c386195347aea66", - "version" : "2.42.1" + "revision" : "7b1d5ee05a23ea24c7458dffed1c563c8501042d", + "version" : "2.45.4" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-crt-swift", "state" : { - "revision" : "7b42e0343f28b3451aab20840dc670abd12790bd", - "version" : "0.36.0" + "revision" : "3f844bef042cc0a4c3381f7090414ce3f9a7e935", + "version" : "0.37.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-sdk-swift.git", "state" : { - "revision" : "828358a2c39d138325b0f87a2d813f4b972e5f4f", - "version" : "1.0.0" + "revision" : "c6c1064da9bfccb119a7a8ab9ba636fb3bbfa6f5", + "version" : "1.0.47" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/smithy-lang/smithy-swift", "state" : { - "revision" : "0ed3440f8c41e27a0937364d5035d2d4fefb8aa3", - "version" : "0.71.0" + "revision" : "3cd9f181b3ba8ff71da43bf53c09f8de6790a4ad", + "version" : "0.96.0" } }, { diff --git a/Package.swift b/Package.swift index 01c172c3..a302e437 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( targets: ["FaceLiveness"]), ], dependencies: [ - .package(url: "https://github.com/aws-amplify/amplify-swift", exact: "2.42.1") + .package(url: "https://github.com/aws-amplify/amplify-swift", exact: "2.45.4") ], targets: [ .target(