Skip to content

Commit 9ab3a98

Browse files
shahmishalshahmishal
authored
Merge pull request swiftlang#91 from apple/add-swift-4.1
Add swift-4.1-branch support
2 parents 5b7483a + de2cb7e commit 9ab3a98

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

‎common.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,19 @@
5151
'swift-corelibs-foundation': 'swift-4.0-branch',
5252
'swift-corelibs-xctest': 'swift-4.0-branch',
5353
},
54+
'swift-4.1-branch': {
55+
'llvm': 'swift-4.1-branch',
56+
'clang': 'swift-4.1-branch',
57+
'compiler-rt': 'swift-4.1-branch',
58+
'swift': 'swift-4.1-branch',
59+
'cmark': 'swift-4.1-branch',
60+
'ninja': 'release',
61+
'llbuild': 'swift-4.1-branch',
62+
'swiftpm': 'swift-4.1-branch',
63+
'swift-corelibs-libdispatch': 'swift-4.1-branch',
64+
'swift-corelibs-foundation': 'swift-4.1-branch',
65+
'swift-corelibs-xctest': 'swift-4.1-branch',
66+
},
5467
'swift-3.1-branch': {
5568
'llvm': 'swift-3.1-branch',
5669
'clang': 'swift-3.1-branch',

‎projects.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"3.1": {
345345
"branch": {
346346
"master": "https://bugs.swift.org/browse/SR-4981",
347+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4981",
347348
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4981"
348349
}
349350
}
@@ -361,6 +362,7 @@
361362
"3.1": {
362363
"branch": {
363364
"master": "https://bugs.swift.org/browse/SR-4981",
365+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4981",
364366
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4981"
365367
}
366368
}
@@ -378,6 +380,7 @@
378380
"3.1": {
379381
"branch": {
380382
"master": "https://bugs.swift.org/browse/SR-4981",
383+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4981",
381384
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4981"
382385
}
383386
}
@@ -395,6 +398,7 @@
395398
"3.1": {
396399
"branch": {
397400
"master": "https://bugs.swift.org/browse/SR-4981",
401+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4981",
398402
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4981"
399403
}
400404
}
@@ -412,6 +416,7 @@
412416
"3.1": {
413417
"branch": {
414418
"master": "https://bugs.swift.org/browse/SR-4981",
419+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4981",
415420
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4981"
416421
}
417422
}
@@ -859,7 +864,8 @@
859864
"compatibility": {
860865
"3.0": {
861866
"branch": {
862-
"master": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable"
867+
"master": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable",
868+
"swift-4.1-branch": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable"
863869
}
864870
}
865871
}
@@ -1165,6 +1171,7 @@
11651171
"3.0": {
11661172
"branch": {
11671173
"master": "https://bugs.swift.org/browse/SR-5265",
1174+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5265",
11681175
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5265"
11691176
}
11701177
}
@@ -1182,6 +1189,7 @@
11821189
"3.0": {
11831190
"branch": {
11841191
"master": "https://bugs.swift.org/browse/SR-5265",
1192+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5265",
11851193
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5265"
11861194
}
11871195
}
@@ -1199,6 +1207,7 @@
11991207
"3.0": {
12001208
"branch": {
12011209
"master": "https://bugs.swift.org/browse/SR-5265",
1210+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5265",
12021211
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5265"
12031212
}
12041213
}
@@ -1216,6 +1225,7 @@
12161225
"3.0": {
12171226
"branch": {
12181227
"master": "https://bugs.swift.org/browse/SR-5265",
1228+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5265",
12191229
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5265"
12201230
}
12211231
}
@@ -1233,6 +1243,7 @@
12331243
"3.0": {
12341244
"branch": {
12351245
"master": "https://bugs.swift.org/browse/SR-5265",
1246+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5265",
12361247
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5265"
12371248
}
12381249
}
@@ -1508,6 +1519,7 @@
15081519
"3.0": {
15091520
"branch": {
15101521
"master": "https://bugs.swift.org/browse/SR-4730",
1522+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4730",
15111523
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4730",
15121524
"swift-3.1-branch": "https://bugs.swift.org/browse/SR-4879"
15131525
}
@@ -1540,6 +1552,7 @@
15401552
"3.0": {
15411553
"branch": {
15421554
"master": "https://bugs.swift.org/browse/SR-4730",
1555+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4730",
15431556
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4730",
15441557
"swift-3.1-branch": "https://bugs.swift.org/browse/SR-4879"
15451558
}
@@ -1749,6 +1762,7 @@
17491762
"3.1": {
17501763
"branch": {
17511764
"master": "https://bugs.swift.org/browse/SR-4968",
1765+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4968",
17521766
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4968"
17531767
}
17541768
}
@@ -1805,6 +1819,7 @@
18051819
"3.1": {
18061820
"branch": {
18071821
"master": "rdar://problem/32185310",
1822+
"swift-4.1-branch": "rdar://problem/32185310",
18081823
"swift-4.0-branch": "rdar://problem/32185310"
18091824
}
18101825
}
@@ -1922,6 +1937,7 @@
19221937
"3.0": {
19231938
"branch": {
19241939
"master": "rdar://problem/32185310",
1940+
"swift-4.1-branch": "rdar://problem/32185310",
19251941
"swift-4.0-branch": "rdar://problem/32185310"
19261942
}
19271943
}
@@ -2024,6 +2040,7 @@
20242040
"3.0": {
20252041
"branch": {
20262042
"master": "https://bugs.swift.org/browse/SR-4696",
2043+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-4696",
20272044
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4696",
20282045
"swift-3.1-branch": "https://bugs.swift.org/browse/SR-4696"
20292046
}
@@ -2239,6 +2256,7 @@
22392256
"3.0": {
22402257
"branch": {
22412258
"master": "https://bugs.swift.org/browse/SR-5683",
2259+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5683",
22422260
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5683"
22432261
}
22442262
}
@@ -2256,6 +2274,7 @@
22562274
"3.0": {
22572275
"branch": {
22582276
"master": "https://bugs.swift.org/browse/SR-5683",
2277+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5683",
22592278
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5683"
22602279
}
22612280
}
@@ -2273,6 +2292,7 @@
22732292
"3.0": {
22742293
"branch": {
22752294
"master": "https://bugs.swift.org/browse/SR-5683",
2295+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5683",
22762296
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5683"
22772297
}
22782298
}
@@ -2290,6 +2310,7 @@
22902310
"3.0": {
22912311
"branch": {
22922312
"master": "https://bugs.swift.org/browse/SR-5683",
2313+
"swift-4.1-branch": "https://bugs.swift.org/browse/SR-5683",
22932314
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-5683"
22942315
}
22952316
}

0 commit comments

Comments
 (0)