From 47ef4294d8a6112e85276203170b2123d52e1c7a Mon Sep 17 00:00:00 2001 From: Jan Svitok Date: Mon, 21 Aug 2023 10:56:56 +0200 Subject: [PATCH] Add support for Xcode 15.0, iOS 17, tvOS 17, watchOS 10, macOS 14 --- conans/client/conf/__init__.py | 26 ++++++++++++------- .../client/build/cpp_std_flags_test.py | 8 ++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/conans/client/conf/__init__.py b/conans/client/conf/__init__.py index 8030ab50a7a..fac3551935b 100644 --- a/conans/client/conf/__init__.py +++ b/conans/client/conf/__init__.py @@ -16,27 +16,35 @@ "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "14.8", - "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1"] + "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1", + "16.2", "16.3", "16.4", "16.5", "16.6", "17.0"] sdk: ["iphoneos", "iphonesimulator"] sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4", "13.0", "13.1", "13.2", "13.4", "13.5", "13.6", "13.7", - "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4", "15.5", "16.0", "16.1"] + "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4", + "15.5", "16.0", "16.1", "16.2", "16.4", "17.0"] watchOS: version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2", - "7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4", "8.5", "8.6", "8.7", "9.0", "9.1"] + "7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4", + "8.5", "8.6", "8.7", "9.0", "9.1", "9.2", "9.3", "9.4", "9.5", "9.6", "10.0"] sdk: ["watchos", "watchsimulator"] sdk_version: [null, "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2", - "7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5", "9.0", "9.1"] + "7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5", "9.0", "9.1", + "9.4", "10.0"] tvOS: version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", - "13.0", "13.2", "13.3", "13.4", "14.0", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", - "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1"] + "13.0", "13.2", "13.3", "13.4", "14.0", "14.2", "14.3", "14.4", "14.5", + "14.6", "14.7", "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", + "16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6", "17.0"] sdk: ["appletvos", "appletvsimulator"] sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4", - "13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0", "15.2", "15.4", "16.0", "16.1"] + "13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0", + "15.2", "15.4", "16.0", "16.1", "16.4", "17.0"] Macos: - version: [null, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0", "12.0", "13.0"] - sdk_version: [null, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1", "12.3", "13.0", "13.1"] + version: [null, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", + "10.14", "10.15", "11.0", "12.0", "13.0", "14.0"] + sdk_version: [null, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1", + "12.3", "13.0", "13.1", "13.3", "14.0"] subsystem: null: catalyst: diff --git a/conans/test/unittests/client/build/cpp_std_flags_test.py b/conans/test/unittests/client/build/cpp_std_flags_test.py index abe0593d4b2..38049ba5995 100644 --- a/conans/test/unittests/client/build/cpp_std_flags_test.py +++ b/conans/test/unittests/client/build/cpp_std_flags_test.py @@ -214,6 +214,13 @@ def test_apple_clang_cppstd_flags(self): self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "23"), "-std=c++2b") self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu23"), "-std=gnu++2b") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "17"), "-std=c++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu17"), "-std=gnu++17") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "20"), "-std=c++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu20"), "-std=gnu++20") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "23"), "-std=c++2b") + self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu23"), "-std=gnu++2b") + def test_apple_clang_cppstd_defaults(self): self.assertEqual(_make_cppstd_default("apple-clang", "2"), "gnu98") self.assertEqual(_make_cppstd_default("apple-clang", "3"), "gnu98") @@ -228,6 +235,7 @@ def test_apple_clang_cppstd_defaults(self): self.assertEqual(_make_cppstd_default("apple-clang", "12"), "gnu98") self.assertEqual(_make_cppstd_default("apple-clang", "13"), "gnu98") self.assertEqual(_make_cppstd_default("apple-clang", "14"), "gnu98") + self.assertEqual(_make_cppstd_default("apple-clang", "15"), "gnu98") def test_visual_cppstd_flags(self): self.assertEqual(_make_cppstd_flag("msvc", "170", "11"), None)