From 01fd49ffb3f02840a360f5d4e19c6b0e6d22cd70 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 2 May 2025 16:56:05 +0000
Subject: [PATCH] 8355446: Change to Xcode 15.4 for building on macOS at Oracle

Reviewed-by: erikj, ihse
---
 doc/building.html         | 8 ++++----
 doc/building.md           | 6 +++---
 make/conf/jib-profiles.js | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index a085f10c48e..722fe6b8d12 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -376,7 +376,7 @@ to date at the time of writing.</p>
 </tr>
 <tr class="odd">
 <td>macOS</td>
-<td>macOS 13.x (Ventura)</td>
+<td>macOS 14.x</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
@@ -513,8 +513,8 @@ this makes it difficult for a project such as the JDK to keep pace with
 a continuously updated machine running macOS. See the section on <a
 href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
-<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
-14, but earlier versions may also work.</p>
+<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
+earlier versions may also work.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -590,7 +590,7 @@ to compile successfully without issues.</p>
 </tr>
 <tr class="even">
 <td>macOS</td>
-<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
+<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
 </tr>
 <tr class="odd">
 <td>Windows</td>
diff --git a/doc/building.md b/doc/building.md
index a31cd5fe775..56bc860a13d 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -175,7 +175,7 @@ time of writing.
 | ----------------- | ---------------------------------- |
 | Linux/x64         | Oracle Enterprise Linux 6.4 / 8.x  |
 | Linux/aarch64     | Oracle Enterprise Linux 7.6 / 8.x  |
-| macOS             | macOS 13.x (Ventura)               |
+| macOS             | macOS 14.x                         |
 | Windows           | Windows Server 2016                |
 
 The double version numbers for Linux are due to the hybrid model used at
@@ -327,7 +327,7 @@ difficult for a project such as the JDK to keep pace with a continuously
 updated machine running macOS. See the section on [Apple Xcode](#apple-xcode)
 on some strategies to deal with this.
 
-It is recommended that you use at least macOS 13 (Ventura) and Xcode 14, but
+It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.
 
 The standard macOS environment contains the basic tooling needed to build, but
@@ -393,7 +393,7 @@ issues.
 | Operating system   | Toolchain version                            |
 | ------------------ | -------------------------------------------- |
 | Linux              | gcc 14.2.0                                   |
-| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)      |
+| macOS              | Apple Xcode 15.4 (using clang 15.0.0)       |
 | Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
 
 All compilers are expected to be able to handle the C11 language standard for
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 40fa453f954..f0cb6f451a3 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1089,7 +1089,7 @@ var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
         linux_x64: "gcc14.2.0-OL6.4+1.0",
-        macosx: "Xcode14.3.1+1.0",
+        macosx: "Xcode15.4+1.0",
         windows_x64: "VS2022-17.13.2+1.0",
         linux_aarch64: "gcc14.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",