From 8283e11d34a6eda88b44e170daf7c04fa8d515f4 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 15:27:10 +0530 Subject: [PATCH 01/10] ci: upgraded xcode version to 15.2 & enabled running tests for visionOS as well --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 477a42a..785d41d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,8 +35,9 @@ jobs: - { os: iOS, scheme: SimpleKeychain-iOS } - { os: macOS, scheme: SimpleKeychain-macOS } - { os: tvOS, scheme: SimpleKeychain-tvOS } + - { os: visionOS, scheme: SimpleKeychain-visionOS } xcode: - - '15.0.1' + - '15.2' steps: - name: Checkout @@ -71,7 +72,7 @@ jobs: strategy: matrix: xcode: - - '15.0.1' + - '15.2' steps: - name: Checkout @@ -92,7 +93,7 @@ jobs: strategy: matrix: xcode: - - '15.0.1' + - '15.2' steps: - name: Checkout From 3c92cfd00f7102e1aeddaed44b7bb757bb110b3a Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 15:54:13 +0530 Subject: [PATCH 02/10] ci: added custom test command for visionOS as mxcl/xcodebuild doesn't support yet --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 785d41d..eb60dc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,11 +49,16 @@ jobs: xcode: ${{ matrix.xcode }} - name: Run tests + if: ${{ matrix.platform.os != 'visionOS' }} uses: ./.github/actions/test with: xcode: ${{ matrix.xcode }} scheme: ${{ matrix.platform.scheme }} platform: ${{ matrix.platform.os }} + + - name: Run tests for visionOS + if: ${{ matrix.platform.os == 'visionOS' }} + run: xcodebuild test -scheme SimpleKeychain-visionOS -project SimpleKeychain.xcodeproj -destination 'platform=visionOS Simulator,name=Apple Vision Pro' - name: Convert coverage report if: ${{ matrix.platform.os == 'iOS' }} From c272e182de0c834687abc88b9e5655ecb877ff97 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 16:15:49 +0530 Subject: [PATCH 03/10] ci: printing destinations on xcode 15.2 --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb60dc3..6b219ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,9 @@ jobs: - name: Run tests for visionOS if: ${{ matrix.platform.os == 'visionOS' }} - run: xcodebuild test -scheme SimpleKeychain-visionOS -project SimpleKeychain.xcodeproj -destination 'platform=visionOS Simulator,name=Apple Vision Pro' + run: | + xcodebuild -scheme SimpleKeychain-visionOS -showdestinations + xcodebuild test -scheme SimpleKeychain-visionOS -project SimpleKeychain.xcodeproj -destination 'platform=visionOS Simulator,name=Apple Vision Pro' - name: Convert coverage report if: ${{ matrix.platform.os == 'iOS' }} From ccdb3f2711ba35eeab45ed1d28e79fe27e546c88 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 16:33:33 +0530 Subject: [PATCH 04/10] ci: changed the runner to macos-13-x-large to include visionOS simulators --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b219ea..09d031f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: needs: authorize # Require approval before running on forked pull requests name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }} environment: ${{ github.event.pull_request.head.repo.fork && 'external' || 'internal' }} - runs-on: macos-13 + runs-on: macos-13-xlarge env: xcodeproj: SimpleKeychain.xcodeproj @@ -74,7 +74,7 @@ jobs: test-package: name: Test Swift package using Xcode ${{ matrix.xcode }} - runs-on: macos-13 + runs-on: macos-13-xlarge strategy: matrix: @@ -95,7 +95,7 @@ jobs: pod-lint: name: Lint podspec using Xcode ${{ matrix.xcode }} - runs-on: macos-13 + runs-on: macos-13-xlarge strategy: matrix: @@ -116,7 +116,7 @@ jobs: swiftlint: name: Lint code with SwiftLint - runs-on: macos-13 + runs-on: macos-13-xlarge steps: - name: Checkout From 0b09defaf27bc04791f384b41f7cffa482d9c21d Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 17:20:24 +0530 Subject: [PATCH 05/10] chore: removed references to Quick, Nimble, CwlPreconditionTesting --- SimpleKeychain.xcodeproj/project.pbxproj | 44 ------------------------ 1 file changed, 44 deletions(-) diff --git a/SimpleKeychain.xcodeproj/project.pbxproj b/SimpleKeychain.xcodeproj/project.pbxproj index 11748c6..959d1f0 100644 --- a/SimpleKeychain.xcodeproj/project.pbxproj +++ b/SimpleKeychain.xcodeproj/project.pbxproj @@ -42,19 +42,12 @@ C1010DEF2C21CEDB001C10B3 /* visionOSTestHostApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1010DEE2C21CEDB001C10B3 /* visionOSTestHostApp.swift */; }; C1010DF12C21CEDB001C10B3 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1010DF02C21CEDB001C10B3 /* ContentView.swift */; }; C1010DF32C21CEDD001C10B3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1010DF22C21CEDD001C10B3 /* Assets.xcassets */; }; - C1D1FBA52C218F2B008E9E3F /* Nimble.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE9CA1126FD42B0005A75FA /* Nimble.xcframework */; }; - C1D1FBA62C218F2B008E9E3F /* Quick.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE9CA1026FD42B0005A75FA /* Quick.xcframework */; }; - C1D1FBAB2C219170008E9E3F /* Nimble.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5CE9CA1126FD42B0005A75FA /* Nimble.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C1D1FBAC2C219170008E9E3F /* Quick.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5CE9CA1026FD42B0005A75FA /* Quick.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C1D1FBAD2C2192FA008E9E3F /* SimpleKeychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDF40592852D88C003840E6 /* SimpleKeychain.swift */; }; C1D1FBAE2C2192FA008E9E3F /* SimpleKeychainError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C737B2A285A7C0200B4BB25 /* SimpleKeychainError.swift */; }; C1D1FBAF2C2192FA008E9E3F /* Accessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C840111285AFF7B00689C01 /* Accessibility.swift */; }; C1D1FBB02C219322008E9E3F /* SimpleKeychainSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F4D27651BCE995C003C27B3 /* SimpleKeychainSpec.swift */; }; C1D1FBB12C219322008E9E3F /* SimpleKeychainErrorSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C737B2F285AB57A00B4BB25 /* SimpleKeychainErrorSpec.swift */; }; C1D1FBB22C219322008E9E3F /* AccessibilitySpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEB577A285BCE7E00A32A80 /* AccessibilitySpec.swift */; }; - C1D1FBBD2C21AC93008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FBBC2C21AC93008E9E3F /* CwlPreconditionTesting */; }; - C1D1FBBF2C21C814008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FBBE2C21C814008E9E3F /* CwlPreconditionTesting */; }; - C1D1FBC12C21C89C008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FBC02C21C89C008E9E3F /* CwlPreconditionTesting */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -246,9 +239,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1D1FBBD2C21AC93008E9E3F /* CwlPreconditionTesting in Frameworks */, - C1D1FBA52C218F2B008E9E3F /* Nimble.xcframework in Frameworks */, - C1D1FBA62C218F2B008E9E3F /* Quick.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -509,7 +499,6 @@ ); name = "SimpleKeychainTests-iOS"; packageProductDependencies = ( - C1D1FBC02C21C89C008E9E3F /* CwlPreconditionTesting */, ); productName = "SimpleKeychainTests-iOS"; productReference = 5F4D277B1BCE99DF003C27B3 /* SimpleKeychainTests.xctest */; @@ -530,7 +519,6 @@ ); name = "SimpleKeychainTests-macOS"; packageProductDependencies = ( - C1D1FBBE2C21C814008E9E3F /* CwlPreconditionTesting */, ); productName = "SimpleKeychainTests-macOS"; productReference = 5F4D278F1BCEA69E003C27B3 /* SimpleKeychainTests.xctest */; @@ -637,7 +625,6 @@ C1D1FB932C218DD1008E9E3F /* Sources */, C1D1FB942C218DD1008E9E3F /* Frameworks */, C1D1FB952C218DD1008E9E3F /* Resources */, - C1D1FBAA2C21915F008E9E3F /* CopyFiles */, ); buildRules = ( ); @@ -647,7 +634,6 @@ ); name = "SimpleKeychainTests-visionOS"; packageProductDependencies = ( - C1D1FBBC2C21AC93008E9E3F /* CwlPreconditionTesting */, ); productName = "SimpleKeychainTests-visionOS"; productReference = C1D1FB972C218DD1008E9E3F /* SimpleKeychainTests.xctest */; @@ -724,7 +710,6 @@ ); mainGroup = 5FEEB9921B7BD70A00501415; packageReferences = ( - C1D1FBBB2C21AC93008E9E3F /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */, ); productRefGroup = 5FEEB99D1B7BD70A00501415 /* Products */; projectDirPath = ""; @@ -2090,35 +2075,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - C1D1FBBB2C21AC93008E9E3F /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 2.2.1; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - C1D1FBBC2C21AC93008E9E3F /* CwlPreconditionTesting */ = { - isa = XCSwiftPackageProductDependency; - package = C1D1FBBB2C21AC93008E9E3F /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; - productName = CwlPreconditionTesting; - }; - C1D1FBBE2C21C814008E9E3F /* CwlPreconditionTesting */ = { - isa = XCSwiftPackageProductDependency; - package = C1D1FBBB2C21AC93008E9E3F /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; - productName = CwlPreconditionTesting; - }; - C1D1FBC02C21C89C008E9E3F /* CwlPreconditionTesting */ = { - isa = XCSwiftPackageProductDependency; - package = C1D1FBBB2C21AC93008E9E3F /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; - productName = CwlPreconditionTesting; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 5FEEB9931B7BD70A00501415 /* Project object */; } From f2796fdfb665733fe0f79b8f4bc125269d2ecf76 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 17:20:49 +0530 Subject: [PATCH 06/10] chore: changed minimum deployment target of visionOS sample app to 1.0 --- SimpleKeychain.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SimpleKeychain.xcodeproj/project.pbxproj b/SimpleKeychain.xcodeproj/project.pbxproj index 959d1f0..30500de 100644 --- a/SimpleKeychain.xcodeproj/project.pbxproj +++ b/SimpleKeychain.xcodeproj/project.pbxproj @@ -1730,7 +1730,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,7"; - XROS_DEPLOYMENT_TARGET = 1.2; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -1768,7 +1768,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,7"; - XROS_DEPLOYMENT_TARGET = 1.2; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; From fdc5739fd5c371095b4dbfbbfb5a5fba0bc0f508 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 17:21:10 +0530 Subject: [PATCH 07/10] chore: updated bundle specs --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d99fbda..6e7ae39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,13 +218,13 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) optparse (0.1.1) os (1.1.4) plist (3.7.0) public_suffix (4.0.7) - racc (1.7.1) + racc (1.8.0) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) @@ -284,7 +284,7 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS - ruby + arm64-darwin-23 DEPENDENCIES cocoapods From a84ce8590f3a0e638b5f99692270fa41d39a79b1 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 17:54:41 +0530 Subject: [PATCH 08/10] chore: upgraded the gems used to latest versions --- Gemfile.lock | 138 ++++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 63 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6e7ae39..99c8cd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,54 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (7.0.8) + activesupport (7.1.3.4) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - artifactory (3.0.15) + artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.831.0) - aws-sdk-core (3.185.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.949.0) + aws-sdk-core (3.200.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.87.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.155.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) + bigdecimal (3.1.8) claide (1.1.0) clamp (1.3.2) - cocoapods (1.13.0) + cocoapods (1.15.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.15.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -52,7 +61,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.15.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -63,7 +72,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -75,18 +84,19 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) dotenv (2.8.1) + drb (2.2.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.104.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -115,15 +125,15 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) - fastlane (2.216.0) + fastimage (2.3.1) + fastlane (2.221.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -135,6 +145,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) @@ -143,10 +154,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -155,16 +166,16 @@ GEM word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-auth0_shipper (0.4.1) semantic (~> 1.5) - ffi (1.16.2) + ffi (1.17.0-arm64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.50.0) + google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -172,24 +183,23 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick google-apis-iamcredentials_v1 (0.17.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -200,45 +210,49 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.6.3) - jwt (2.7.1) - mini_magick (4.12.0) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.1) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.24.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.3.0) + multipart-post (2.4.1) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) + nkf (0.2.0) nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - optparse (0.1.1) + optparse (0.5.0) os (1.1.4) - plist (3.7.0) + plist (3.7.1) public_suffix (4.0.7) racc (1.8.0) - rake (13.0.6) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.9) + strscan rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) + security (0.1.5) semantic (1.6.1) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -246,32 +260,29 @@ GEM simctl (1.6.10) CFPropertyList naturally - slather (2.7.5) + slather (2.8.2) CFPropertyList (>= 2.2, < 4) activesupport clamp (~> 1.3) nokogiri (>= 1.14.3) xcodeproj (~> 1.21) + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) unicode-display_width (2.5.0) - webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.23.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -284,6 +295,7 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + arm64-darwin-22 arm64-darwin-23 DEPENDENCIES From 44eab9f3ae80487b4b649c80aae57cdf9333e288 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 17:55:09 +0530 Subject: [PATCH 09/10] ci: installing swift lint manually on arm64 macos runners --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09d031f..ef4d8de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,5 +122,8 @@ jobs: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - name: Install SwiftLint + run: brew install swiftlint + - name: Run SwiftLint run: swiftlint lint --reporter github-actions-logging From d0f041ee15bac8c751a3ff8948622005bbb90474 Mon Sep 17 00:00:00 2001 From: Sai Venkat Desu Date: Mon, 1 Jul 2024 18:29:43 +0530 Subject: [PATCH 10/10] ci: upgraded macos and xcode version to the latest --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef4d8de..6c1a562 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: needs: authorize # Require approval before running on forked pull requests name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }} environment: ${{ github.event.pull_request.head.repo.fork && 'external' || 'internal' }} - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge env: xcodeproj: SimpleKeychain.xcodeproj @@ -37,7 +37,7 @@ jobs: - { os: tvOS, scheme: SimpleKeychain-tvOS } - { os: visionOS, scheme: SimpleKeychain-visionOS } xcode: - - '15.2' + - '15.4' steps: - name: Checkout @@ -74,12 +74,12 @@ jobs: test-package: name: Test Swift package using Xcode ${{ matrix.xcode }} - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge strategy: matrix: xcode: - - '15.2' + - '15.4' steps: - name: Checkout @@ -95,12 +95,12 @@ jobs: pod-lint: name: Lint podspec using Xcode ${{ matrix.xcode }} - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge strategy: matrix: xcode: - - '15.2' + - '15.4' steps: - name: Checkout @@ -116,7 +116,7 @@ jobs: swiftlint: name: Lint code with SwiftLint - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge steps: - name: Checkout