From 4abdf76083d24cc12e98b6910d7e6685ca52b136 Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 10:17:53 -0700 Subject: [PATCH 1/7] Update AppCheckCore dependency to v11 GoogleUtilities also has to be updated to v8 because that is AppCheckCore's version for this dependency. --- GoogleSignIn.podspec | 6 +++--- Package.swift | 4 ++-- Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec index b24a6cb4..cd894310 100644 --- a/GoogleSignIn.podspec +++ b/GoogleSignIn.podspec @@ -33,7 +33,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th ] s.ios.framework = 'UIKit' s.osx.framework = 'AppKit' - s.dependency 'AppCheckCore', '>= 10.19.1', '< 11.0' + s.dependency 'AppCheckCore', '~> 11.0' s.dependency 'AppAuth', '>= 1.7.3', '< 2.0' s.dependency 'GTMAppAuth', '>= 4.1.1', '< 5.0' s.dependency 'GTMSessionFetcher/Core', '~> 3.3' @@ -56,7 +56,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th ] unit_tests.requires_app_host = true unit_tests.dependency 'OCMock' - unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.13' - unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.13' + unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0' + unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 8.0' end end diff --git a/Package.swift b/Package.swift index 432e7003..ebdb31a6 100644 --- a/Package.swift +++ b/Package.swift @@ -48,7 +48,7 @@ let package = Package( .package( name: "AppCheck", url: "https://github.com/google/app-check.git", - "10.19.1" ..< "11.0.0"), + from: "11.0.0"), .package( name: "GTMAppAuth", url: "https://github.com/google/GTMAppAuth.git", @@ -64,7 +64,7 @@ let package = Package( .package( name: "GoogleUtilities", url: "https://github.com/google/GoogleUtilities.git", - from: "7.13.0"), + from: "8.0.0"), ], targets: [ .target( diff --git a/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift b/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift new file mode 100644 index 00000000..83a5d2f7 --- /dev/null +++ b/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift @@ -0,0 +1,8 @@ +// +// Foo.swift +// DaysUntilBirthday +// +// Created by Matt Mathias on 7/11/24. +// + +import Foundation From 3e4ae58e72b43e669d6f3e475e05eb7fccd488e2 Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 10:54:51 -0700 Subject: [PATCH 2/7] Update swift tools version to 5.5 to satisfy GoogleUtilities --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ebdb31a6..5e167e76 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 // The swift-tools-version declares the minimum version of Swift required to build this package. // Copyright 2021 Google LLC From 4ce2ed6b65be3256f99cc176ffcc75e0407094bc Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 11:15:55 -0700 Subject: [PATCH 3/7] Remove unnecessary test file --- Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift diff --git a/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift b/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift deleted file mode 100644 index 83a5d2f7..00000000 --- a/Samples/Swift/DaysUntilBirthday/Shared/Services/Foo.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// Foo.swift -// DaysUntilBirthday -// -// Created by Matt Mathias on 7/11/24. -// - -import Foundation From de40461c6823ca14dcef975d095c38f922b368d4 Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 11:22:30 -0700 Subject: [PATCH 4/7] Update macos runner for spm --- .github/workflows/builds.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index d240880f..cb26e338 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-latest] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 4da0d6b0..0803d4f3 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-latest] sdk: ['macosx', 'iphonesimulator'] include: - sdk: 'macosx' From 8e3f1e984ab5469ed9421eabe9d90a62f38b8208 Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 12:33:21 -0700 Subject: [PATCH 5/7] Use macos-latest throughout Also update to iPhone 14, which is available. --- .github/workflows/integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 4ed7c580..9c2c5faa 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-12 + runs-on: macos-latest needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' + -destination 'platform=iOS Simulator,name=iPhone 14' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' \ + -destination 'platform=iOS Simulator,name=iPhone 14' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From 895001f8b0d5aa5e5f6e699f03e397f025a9f7d4 Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 13:46:52 -0700 Subject: [PATCH 6/7] Use iPhone 14 --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 0803d4f3..0c0536cf 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -45,7 +45,7 @@ jobs: - sdk: 'macosx' destination: '"platform=OS X,arch=x86_64"' - sdk: 'iphonesimulator' - destination: '"platform=iOS Simulator,name=iPhone 11"' + destination: '"platform=iOS Simulator,name=iPhone 14"' steps: - uses: actions/checkout@v3 - name: Build unit test target From 180d88a66283ac5d4a40c6910dc67c92c2d9970c Mon Sep 17 00:00:00 2001 From: Matt Mathias Date: Fri, 12 Jul 2024 15:34:55 -0700 Subject: [PATCH 7/7] Specify iOS version in integration tests --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 9c2c5faa..7b303e38 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 14' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 14' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET