From ca0c74bd8c8950dfa817fa753807c0f27ce6f7b6 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 20 Aug 2024 11:32:38 -0700 Subject: [PATCH] Upgrade to Xcode 16 beta 5 --- .ruby-version | 2 +- CHANGELOG.md | 2 +- Gemfile.lock | 70 ++++++++++++++++++++++------------------- build.sh | 3 +- scripts/pr-ci-matrix.rb | 2 +- 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.ruby-version b/.ruby-version index 0aec50e6ed..a0891f563f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.3.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 462007f441..6c3a47480d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ x.y.z Release notes (yyyy-MM-dd) * APIs are backwards compatible with all previous releases in the 10.x.y series. * Carthage release for Swift is built with Xcode 15.4.0. * CocoaPods: 1.10 or later. -* Xcode: 15.1.0-16 beta 4. +* Xcode: 15.1.0-16 beta 5. ### Internal * Upgraded realm-core from ? to ? diff --git a/Gemfile.lock b/Gemfile.lock index 6f9e8f22e2..0580766ca4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,29 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (7.1.3) + activesupport (7.2.0) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + 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) atomos (0.1.3) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.8) claide (1.1.0) cocoapods (1.15.2) addressable (~> 2.8) @@ -60,67 +63,70 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - faraday (2.9.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) + logger + faraday-net_http (3.1.1) net-http - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) fileutils (1.7.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jazzy (0.14.4) + jazzy (0.15.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) redcarpet (~> 3.4) - rexml (~> 3.2) + rexml (>= 3.2.7, < 4.0) rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.7.1) - jwt (2.8.1) + json (2.7.2) + jwt (2.8.2) base64 liferaft (0.0.6) - minitest (5.22.2) + logger (1.6.0) + minitest (5.25.1) molinillo (0.8.0) mustache (1.1.1) - mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) net-http (0.4.1) uri netrc (0.11.0) - octokit (8.1.0) - base64 + nkf (0.2.0) + octokit (9.1.0) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) - pathname (0.2.0) + pathname (0.3.0) public_suffix (4.0.7) redcarpet (3.6.0) - rexml (3.2.6) - rouge (4.2.0) + rexml (3.3.5) + strscan + rouge (4.3.0) ruby-macho (2.5.1) - ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - sqlite3 (1.7.2-arm64-darwin) - sqlite3 (1.7.2-x86_64-darwin) + securerandom (0.3.1) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86_64-darwin) + strscan (3.1.0) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) @@ -128,13 +134,13 @@ GEM uri (0.13.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.24.0) + xcodeproj (1.25.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) + rexml (>= 3.3.2, < 4.0) PLATFORMS arm64-darwin-22 @@ -150,4 +156,4 @@ DEPENDENCIES pathname BUNDLED WITH - 2.3.26 + 2.5.11 diff --git a/build.sh b/build.sh index efabdc94dd..047346d74c 100755 --- a/build.sh +++ b/build.sh @@ -372,7 +372,6 @@ build_docs() { objc="" fi - echo ">>> RUN JAZZY" jazzy \ "${objc}" \ --clean \ @@ -1367,7 +1366,7 @@ x.y.z Release notes (yyyy-MM-dd) * APIs are backwards compatible with all previous releases in the 10.x.y series. * Carthage release for Swift is built with Xcode 15.4.0. * CocoaPods: 1.10 or later. -* Xcode: 15.1.0-16 beta 4. +* Xcode: 15.1.0-16 beta 5. ### Internal * Upgraded realm-core from ? to ? diff --git a/scripts/pr-ci-matrix.rb b/scripts/pr-ci-matrix.rb index 40ed1466bc..a5199bcb0f 100755 --- a/scripts/pr-ci-matrix.rb +++ b/scripts/pr-ci-matrix.rb @@ -86,7 +86,7 @@ def action # because they don't care about Xcode versions, while some others are latest-only # because they're particularly slow to run. module Workflows - XCODE_VERSIONS = %w(15.1 15.2 15.3 15.4 16\ beta\ 4) + XCODE_VERSIONS = %w(15.1 15.2 15.3 15.4 16\ beta\ 5) all = ->(v) { true } latest_only = ->(v) { v == XCODE_VERSIONS.last }