From 6f1b536669107a4b9327a92a23ecc51c9b6525c0 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 12 Nov 2025 08:03:13 +0100 Subject: [PATCH 1/2] Update Tier support to MacOS Sequoia (#1163) Signed-off-by: Miguel Company (cherry picked from commit 9b8762ce0d58efd338ff8754feb60e7111713d15) # Conflicts: # docs/notes/versions.rst --- docs/notes/versions.rst | 127 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 6 deletions(-) diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst index 187a61088..24dec6e61 100644 --- a/docs/notes/versions.rst +++ b/docs/notes/versions.rst @@ -85,6 +85,121 @@ The following table shows the minimum version required of the Fast DDS build sys .. tab-set:: +<<<<<<< HEAD +======= + .. tab-item:: 3.4.x + :sync: 3.4.x + + .. list-table:: + + * - **CMake** + - 3.20 + + .. list-table:: + :header-rows: 1 + + * - OS \ Architecture + - amd64 + - amd32 + - arm64 + * - Ubuntu Noble (24.04) + - Tier 3: GCC 13.2 + - **───** + - Tier 3: GCC 13.2 + * - Ubuntu Jammy (22.04) + - Tier 1: GCC 11.4 |br| + Tier 3: Clang 15 + - **───** + - Tier 1: GCC 11.4 |br| + Tier 3: Clang 15 + * - MacOS Sequoia (15) + - Tier 1: Clang 16 + - **───** + - **───** + * - Windows 10 + - Tier 1: MSVC v142 (Visual Studio 2019) |br| + Tier 3: MSVC v141 (Visual Studio 2017) + - Tier 3: MSVC v142 (Visual Studio 2019) |br| + Tier 3: MSVC v141 (Visual Studio 2017) + - **───** + * - Windows 11 + - Tier 3: MSVC v143 (Visual Studio 2022) + - Tier 3: MSVC v143 (Visual Studio 2022) + - **───** + * - Debian Buster (10) + - Tier 3: GCC 8 + - **───** + - Tier 3: GCC 8 + * - Android 12 + - Tier 3: SDK 31 + - **───** + - Tier 3: SDK 31 + * - Android 13 + - Tier 3: SDK 33 + - **───** + - Tier 3: SDK 33 + * - QNX 7.1 + - Tier 3: QCC (over GCC 8.3) + - **───** + - Tier 3: QCC (over GCC 8.3) + + .. tab-item:: 3.3.x + :sync: 3.3.x + + .. list-table:: + + * - **CMake** + - 3.20 + + .. list-table:: + :header-rows: 1 + + * - OS \ Architecture + - amd64 + - amd32 + - arm64 + * - Ubuntu Noble (24.04) + - Tier 3: GCC 13.2 + - **───** + - Tier 3: GCC 13.2 + * - Ubuntu Jammy (22.04) + - Tier 1: GCC 11.4 |br| + Tier 3: Clang 15 + - **───** + - Tier 1: GCC 11.4 |br| + Tier 3: Clang 15 + * - MacOS Sequoia (15) + - Tier 1: Clang 16 + - **───** + - **───** + * - Windows 10 + - Tier 1: MSVC v142 (Visual Studio 2019) |br| + Tier 3: MSVC v141 (Visual Studio 2017) + - Tier 3: MSVC v142 (Visual Studio 2019) |br| + Tier 3: MSVC v141 (Visual Studio 2017) + - **───** + * - Windows 11 + - Tier 3: MSVC v143 (Visual Studio 2022) + - Tier 3: MSVC v143 (Visual Studio 2022) + - **───** + * - Debian Buster (10) + - Tier 3: GCC 8 + - **───** + - Tier 3: GCC 8 + * - Android 12 + - Tier 3: SDK 31 + - **───** + - Tier 3: SDK 31 + * - Android 13 + - Tier 3: SDK 33 + - **───** + - Tier 3: SDK 33 + * - QNX 7.1 + - Tier 3: QCC (over GCC 8.3) + - **───** + - Tier 3: QCC (over GCC 8.3) + +>>>>>>> 9b8762c (Update Tier support to MacOS Sequoia (#1163)) .. tab-item:: 3.2.x :sync: 3.2.x @@ -110,8 +225,8 @@ The following table shows the minimum version required of the Fast DDS build sys - **───** - Tier 1: GCC 11.4 |br| Tier 3: Clang 15 - * - MacOS Mojave (10.14) - - Tier 1: Clang 15 + * - MacOS Sequoia (15) + - Tier 1: Clang 16 - **───** - **───** * - Windows 10 @@ -166,8 +281,8 @@ The following table shows the minimum version required of the Fast DDS build sys - Tier 3: GCC 9 - **───** - Tier 3: GCC 9 - * - MacOS Mojave (10.14) - - Tier 1: Clang 15 + * - MacOS Sequoia (15) + - Tier 1: Clang 16 - **───** - **───** * - Windows 10 @@ -218,8 +333,8 @@ The following table shows the minimum version required of the Fast DDS build sys - **───** - Tier 1: GCC 9 |br| Tier 3: Clang 12 - * - MacOS Mojave (10.14) - - Tier 1: Clang 12 + * - MacOS Sequoia (15) + - Tier 1: Clang 16 - **───** - **───** * - Windows 10 From a4006d2d24447c8a7fdec98002fc9eacc836dfe1 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 12 Nov 2025 09:42:15 +0100 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Miguel Company --- docs/notes/versions.rst | 115 ---------------------------------------- 1 file changed, 115 deletions(-) diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst index 24dec6e61..5a96a2aa6 100644 --- a/docs/notes/versions.rst +++ b/docs/notes/versions.rst @@ -85,121 +85,6 @@ The following table shows the minimum version required of the Fast DDS build sys .. tab-set:: -<<<<<<< HEAD -======= - .. tab-item:: 3.4.x - :sync: 3.4.x - - .. list-table:: - - * - **CMake** - - 3.20 - - .. list-table:: - :header-rows: 1 - - * - OS \ Architecture - - amd64 - - amd32 - - arm64 - * - Ubuntu Noble (24.04) - - Tier 3: GCC 13.2 - - **───** - - Tier 3: GCC 13.2 - * - Ubuntu Jammy (22.04) - - Tier 1: GCC 11.4 |br| - Tier 3: Clang 15 - - **───** - - Tier 1: GCC 11.4 |br| - Tier 3: Clang 15 - * - MacOS Sequoia (15) - - Tier 1: Clang 16 - - **───** - - **───** - * - Windows 10 - - Tier 1: MSVC v142 (Visual Studio 2019) |br| - Tier 3: MSVC v141 (Visual Studio 2017) - - Tier 3: MSVC v142 (Visual Studio 2019) |br| - Tier 3: MSVC v141 (Visual Studio 2017) - - **───** - * - Windows 11 - - Tier 3: MSVC v143 (Visual Studio 2022) - - Tier 3: MSVC v143 (Visual Studio 2022) - - **───** - * - Debian Buster (10) - - Tier 3: GCC 8 - - **───** - - Tier 3: GCC 8 - * - Android 12 - - Tier 3: SDK 31 - - **───** - - Tier 3: SDK 31 - * - Android 13 - - Tier 3: SDK 33 - - **───** - - Tier 3: SDK 33 - * - QNX 7.1 - - Tier 3: QCC (over GCC 8.3) - - **───** - - Tier 3: QCC (over GCC 8.3) - - .. tab-item:: 3.3.x - :sync: 3.3.x - - .. list-table:: - - * - **CMake** - - 3.20 - - .. list-table:: - :header-rows: 1 - - * - OS \ Architecture - - amd64 - - amd32 - - arm64 - * - Ubuntu Noble (24.04) - - Tier 3: GCC 13.2 - - **───** - - Tier 3: GCC 13.2 - * - Ubuntu Jammy (22.04) - - Tier 1: GCC 11.4 |br| - Tier 3: Clang 15 - - **───** - - Tier 1: GCC 11.4 |br| - Tier 3: Clang 15 - * - MacOS Sequoia (15) - - Tier 1: Clang 16 - - **───** - - **───** - * - Windows 10 - - Tier 1: MSVC v142 (Visual Studio 2019) |br| - Tier 3: MSVC v141 (Visual Studio 2017) - - Tier 3: MSVC v142 (Visual Studio 2019) |br| - Tier 3: MSVC v141 (Visual Studio 2017) - - **───** - * - Windows 11 - - Tier 3: MSVC v143 (Visual Studio 2022) - - Tier 3: MSVC v143 (Visual Studio 2022) - - **───** - * - Debian Buster (10) - - Tier 3: GCC 8 - - **───** - - Tier 3: GCC 8 - * - Android 12 - - Tier 3: SDK 31 - - **───** - - Tier 3: SDK 31 - * - Android 13 - - Tier 3: SDK 33 - - **───** - - Tier 3: SDK 33 - * - QNX 7.1 - - Tier 3: QCC (over GCC 8.3) - - **───** - - Tier 3: QCC (over GCC 8.3) - ->>>>>>> 9b8762c (Update Tier support to MacOS Sequoia (#1163)) .. tab-item:: 3.2.x :sync: 3.2.x