From 3a4afce6239f1803cb06d15659c2ef956a7491a9 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 27 Apr 2022 11:31:01 -0400 Subject: [PATCH] [CI] Update to Xcode 13.3.1 (#3961) * [CI] Update to Xcode 13.3.1 * Update jazzy --- Gemfile.lock | 115 ++++++++++++++++++++++++++------------------ azure-pipelines.yml | 24 ++++----- 2 files changed, 79 insertions(+), 60 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4c51d0fe1..4ba28ac9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,29 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - activesupport (5.2.5) + CFPropertyList (3.0.5) + rexml + activesupport (6.1.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - claide (1.0.3) + claide (1.1.0) claide-plugins (0.9.2) cork nap open4 (~> 1.3) - cocoapods (1.10.1) - addressable (~> 2.6) + cocoapods (1.11.3) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.11.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,34 +34,34 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.3) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.10) cork (0.3.0) colored2 (~> 3.1) - danger (8.2.3) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -73,86 +75,103 @@ GEM octokit (~> 4.7) terminal-table (>= 1, < 4) escape (0.0.4) - ethon (0.13.0) + ethon (0.15.0) ffi (>= 1.15.0) - faraday (1.4.1) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - ffi (1.15.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.8.1) + git (1.11.0) rchardet (~> 1.8) httpclient (2.8.3) - i18n (1.8.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) - jazzy (0.13.6) + jazzy (0.14.2) cocoapods (~> 1.5) mustache (~> 1.1) - open4 + open4 (~> 1.3) redcarpet (~> 3.4) + rexml (~> 3.2) rouge (>= 2.0.6, < 4.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.5.1) - kramdown (2.3.1) + json (2.6.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liferaft (0.0.6) - minitest (5.14.4) - molinillo (0.6.6) + minitest (5.15.0) + molinillo (0.8.0) multipart-post (2.1.1) mustache (1.1.1) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) no_proxy_fix (0.1.2) - octokit (4.20.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - public_suffix (4.0.6) + public_suffix (4.0.7) rchardet (1.8.0) redcarpet (3.5.1) rexml (3.2.5) - rouge (3.26.0) - ruby-macho (1.4.0) - ruby2_keywords (0.0.4) + rouge (3.28.0) + ruby-macho (2.5.1) + ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) sqlite3 (1.4.2) - terminal-table (3.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - unicode-display_width (1.7.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + unicode-display_width (2.1.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.5.4) PLATFORMS + arm64-darwin-21 ruby DEPENDENCIES @@ -161,4 +180,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 2.1.4 + 2.3.8 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f06f83a68..c65c856bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,14 +19,14 @@ jobs: - job: Xcode pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' strategy: maxParallel: 10 matrix: - xcode13: - DEVELOPER_DIR: /Applications/Xcode_13.0.app xcode1321: DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + xcode1331: + DEVELOPER_DIR: /Applications/Xcode_13.3.1.app steps: - script: | sw_vers @@ -37,14 +37,14 @@ jobs: - job: SwiftPM pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' strategy: maxParallel: 10 matrix: - xcode13: - DEVELOPER_DIR: /Applications/Xcode_13.0.app xcode1321: DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + xcode1331: + DEVELOPER_DIR: /Applications/Xcode_13.3.1.app steps: - script: | sw_vers @@ -60,9 +60,9 @@ jobs: - job: CocoaPods pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' variables: - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + DEVELOPER_DIR: /Applications/Xcode_13.3.1.app steps: - script: bundle install --path vendor/bundle displayName: bundle install @@ -73,9 +73,9 @@ jobs: - job: TSan pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' variables: - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + DEVELOPER_DIR: /Applications/Xcode_13.3.1.app steps: - script: swift build --configuration release --sanitize thread displayName: Build SwiftLint @@ -88,9 +88,9 @@ jobs: - job: jazzy pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' variables: - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + DEVELOPER_DIR: /Applications/Xcode_13.3.1.app steps: - script: swift run swiftlint generate-docs displayName: Run swiftlint generate-docs