From 0e7f203b822e6651343eebf24f9b9c5757494d8b Mon Sep 17 00:00:00 2001 From: Luc Dion Date: Sat, 6 Jan 2024 13:30:02 -0500 Subject: [PATCH] Update --- .github/workflows/github-actions-ci.yml | 35 ++++++++++++----------- Gemfile.lock | 37 +++++++++++++++++-------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml index 1db39a7..80bdd5f 100644 --- a/.github/workflows/github-actions-ci.yml +++ b/.github/workflows/github-actions-ci.yml @@ -3,10 +3,9 @@ on: [push, pull_request] jobs: CI: - runs-on: macos-latest - # ℹ️ Available GitHub Actions Runner Images # https://github.com/actions/runner-images + runs-on: macos-13 steps: - name: Checkout @@ -15,49 +14,49 @@ jobs: - run: bundle install - run: pod install --repo-update - - name: Set Xcode Version 14.2.0 (iOS 16.2) - run: sudo xcode-select -s /Applications/Xcode_14.2.0.app + - name: Set Xcode Version 15.1.0 (iOS 17) + run: sudo xcode-select -s /Applications/Xcode_15.1.app - name: Build PinLayout-iOS - run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty + run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty - name: Build PinLayout-tvOS - run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS -sdk appletvsimulator16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1' | xcpretty + run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS -sdk appletvsimulator17.2 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=17.2' | xcpretty - name: Build PinLayout-macOS run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS -sdk macosx13.1 | xcpretty - - name: Build PinLayoutSample - iOS 16.2 - run: set -o pipefail && xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty + - name: Build PinLayoutSample - iOS 17.2 + run: set -o pipefail && xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty - name: iOS unit tests - run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty + run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty # # - name: tvOS unit tests - # # run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -sdk appletvos16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.2' | xcpretty + # # run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -sdk appletvos17.2 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=17.2' | xcpretty # # - name: macOS unit tests # # run: set -o pipefail && xcodebuild test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -sdk macosx12.1 -destination 'platform=macOS,name=Any Mac' | xcpretty - name: Cocoapods - iOS Empty project - run: set -o pipefail && cd TestProjects/cocoapods/ios && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && cd ../../.. + run: set -o pipefail && cd TestProjects/cocoapods/ios && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty && cd ../../.. # - name: Cocoapods - macOS Empty project # run: set -o pipefail && cd TestProjects/cocoapods/macos && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx12.1 | xcpretty && cd ../../.. # - name: Cocoapods - tvOS Empty project - # run: set -o pipefail && cd TestProjects/cocoapods/tvos && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1' | xcpretty && cd ../../.. + # run: set -o pipefail && cd TestProjects/cocoapods/tvos && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator17.2 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=17.2' | xcpretty && cd ../../.. # - name: Carthage - iOS Empty project - # run: set -o pipefail && cd TestProjects/carthage/ios && rm Cartfile && echo "git \"file:///$BASEDIR\"" > Cartfile && carthage update --use-ssh --platform iOS --use-xcframeworks && xcodebuild build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && rm Cartfile.resolved && cd ../../.. + # run: set -o pipefail && cd TestProjects/carthage/ios && rm Cartfile && echo "git \"file:///$BASEDIR\"" > Cartfile && carthage update --use-ssh --platform iOS --use-xcframeworks && xcodebuild build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty && rm Cartfile.resolved && cd ../../.. - name: Swift Package Manager - iOS Empty project - run: set -o pipefail && cd TestProjects/swift-package-manager/ios && rm -rf .build && xcodebuild build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && cd ../../.. + run: set -o pipefail && cd TestProjects/swift-package-manager/ios && rm -rf .build && xcodebuild build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator17.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=17.2' | xcpretty && cd ../../.. - - name: Set XCode Version 13.4.1 (iOS 15.5) - run: sudo xcode-select -s /Applications/Xcode_13.4.1.app - - name: Build PinLayoutSample - iOS 15.5 - run: set -o pipefail && xcodebuild clean build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator15.5 -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.5' | xcpretty + - name: Set XCode Version 14.3.1 (iOS 16.2) + run: sudo xcode-select -s /Applications/Xcode_14.3.1.app + - name: Build PinLayoutSample - iOS 16.2 + run: set -o pipefail && xcodebuild clean build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty - name: Pod lib lint run: set -o pipefail && bundle exec pod lib lint --allow-warnings diff --git a/Gemfile.lock b/Gemfile.lock index 374dfa5..bbfb649 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,24 +3,31 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.7.2) + activesupport (7.1.1) + 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.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.1.1) + bigdecimal (3.1.4) claide (1.1.0) - cocoapods (1.12.0) + cocoapods (1.14.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) + cocoapods-core (= 1.14.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -32,8 +39,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +51,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -54,10 +61,13 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) + drb (2.1.1) + ruby2_keywords escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -65,19 +75,21 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) - minitest (5.19.0) + minitest (5.20.0) molinillo (0.8.0) + mutex_m (0.1.2) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) - rexml (3.2.5) + rexml (3.2.6) ruby-macho (2.5.1) + ruby2_keywords (0.0.5) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -87,6 +99,7 @@ GEM PLATFORMS arm64-darwin-22 + arm64-darwin-23 universal-darwin-21 x86_64-linux