Skip to content

Commit 79cc1b7

Browse files
authored
Merge pull request #4063 from czoido/release/2.15.1
Update Apple products supported versions in docs
1 parent 161cb70 commit 79cc1b7

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

changelog.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Changelog
33

44
For a more detailed description of the major changes that Conan 2 brings, compared with Conan 1.X, please read :ref:`whatsnew`
55

6+
2.15.1 (14-Apr-2025)
7+
--------------------
8+
9+
- Feature: Update Apple products supported versions. `#18122 <https://github.com/conan-io/conan/pull/18122>`_ . Docs `here <https://github.com/conan-io/docs/pull/4063>`__
10+
11+
612
2.15.0 (31-Mar-2025)
713
--------------------
814

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# The short X.Y version.
6868
version = "2.15"
6969
# The full version, including alpha/beta/rc tags.
70-
release = u'2.15.0'
70+
release = u'2.15.1'
7171

7272
dir_path = os.path.dirname(os.path.realpath(__file__))
7373
if not os.path.exists(os.path.join(dir_path, "versions.json")):

reference/config_files/settings.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ It looks like this:
3030
"15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "15.7", "15.8",
3131
"16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6", "16.7",
3232
"17.0", "17.1", "17.2", "17.3", "17.4", "17.5", "17.6", "17.8",
33-
"18.0", "18.1"]
33+
"18.0", "18.1", "18.2", "18.3", "18.4"]
3434
sdk: ["iphoneos", "iphonesimulator"]
3535
sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
3636
"13.0", "13.1", "13.2", "13.4", "13.5", "13.6", "13.7",
3737
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4",
3838
"15.5", "16.0", "16.1", "16.2", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5",
39-
"18.0", "18.1"]
39+
"18.0", "18.1", "18.2", "18.3", "18.4"]
4040
watchOS:
4141
version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2", "6.3",
4242
"7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6",
4343
"8.0", "8.1", "8.3", "8.4", "8.5", "8.6", "8.7",
4444
"9.0","9.1", "9.2", "9.3", "9.4", "9.5", "9.6",
4545
"10.0", "10.1", "10.2", "10.3", "10.4", "10.5", "10.6",
46-
"11.0", "11.1"]
46+
"11.0", "11.1", "11.2", "11.3", "11.4"]
4747
sdk: ["watchos", "watchsimulator"]
4848
sdk_version: [null, "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2",
4949
"7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5", "9.0", "9.1",
50-
"9.4", "10.0", "10.1", "10.2", "10.4", "10.5", "11.0", "11.1"]
50+
"9.4", "10.0", "10.1", "10.2", "10.4", "10.5", "11.0", "11.1", "11.2", "11.3", "11.4"]
5151
tvOS:
5252
version: ["11.0", "11.1", "11.2", "11.3", "11.4",
5353
"12.0", "12.1", "12.2", "12.3", "12.4",
@@ -56,26 +56,26 @@ It looks like this:
5656
"15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6",
5757
"16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6",
5858
"17.0", "17.1", "17.2", "17.3", "17.4", "17.5", "17.6",
59-
"18.0", "18.1"]
59+
"18.0", "18.1", "18.2", "18.3", "18.4"]
6060
sdk: ["appletvos", "appletvsimulator"]
6161
sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
6262
"13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0",
6363
"15.2", "15.4", "16.0", "16.1", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5",
64-
"18.0", "18.1"]
64+
"18.0", "18.1", "18.2", "18.3", "18.4"]
6565
visionOS:
66-
version: ["1.0", "1.1", "1.2", "2.0", "2.1"]
66+
version: ["1.0", "1.1", "1.2", "2.0", "2.1", "2.2", "2.3", "2.4"]
6767
sdk: ["xros", "xrsimulator"]
68-
sdk_version: [null, "1.0", "1.1", "1.2", "2.0", "2.1"]
68+
sdk_version: [null, "1.0", "1.1", "1.2", "2.0", "2.1", "2.2", "2.3", "2.4"]
6969
Macos:
7070
version: [null, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15",
7171
"11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7",
7272
"12.0", "12.1", "12.2", "12.3", "12.4", "12.5", "12.6", "12.7",
7373
"13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7",
7474
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7",
75-
"15.0", "15.1"]
75+
"15.0", "15.1", "15.2", "15.3", "15.4"]
7676
sdk_version: [null, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1",
7777
"12.3", "13.0", "13.1", "13.3", "14.0", "14.2", "14.4", "14.5",
78-
"15.0", "15.1"]
78+
"15.0", "15.1", "15.2", "15.3", "15.4"]
7979
subsystem:
8080
null:
8181
catalyst:
@@ -145,7 +145,7 @@ It looks like this:
145145
cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
146146
apple-clang:
147147
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1",
148-
"10.0", "11.0", "12.0", "13", "13.0", "13.1", "14", "14.0", "15", "15.0", "16", "16.0"]
148+
"10.0", "11.0", "12.0", "13", "13.0", "13.1", "14", "14.0", "15", "15.0", "16", "16.0", "17", "17.0"]
149149
libcxx: [libstdc++, libc++]
150150
cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23, 26, gnu26]
151151
cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]

0 commit comments

Comments
 (0)