Skip to content

Commit 8d944fd

Browse files
shahmishalshahmishal
authored
Merge pull request swiftlang#282 from apple/add-swift-5-support
Add support for Swift 5.0 branch
2 parents 7041c62 + bb085d4 commit 8d944fd

File tree

2 files changed

+42
-24
lines changed

2 files changed

+42
-24
lines changed

‎common.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@
5858
'swift-corelibs-xctest': 'swift-4.2-branch',
5959
},
6060
'swift-5.0-branch': {
61-
'llvm': 'swift-4.1-branch',
62-
'clang': 'swift-4.1-branch',
63-
'compiler-rt': 'swift-4.1-branch',
61+
'llvm': 'swift-5.0-branch',
62+
'clang': 'swift-5.0-branch',
63+
'compiler-rt': 'swift-5.0-branch',
6464
'swift': 'swift-5.0-branch',
6565
'cmark': 'master',
6666
'ninja': 'release',
67-
'llbuild': 'swift-4.1-branch',
68-
'swiftpm': 'swift-4.1-branch',
69-
'swift-corelibs-libdispatch': 'swift-4.1-branch',
70-
'swift-corelibs-foundation': 'swift-4.1-branch',
71-
'swift-corelibs-xctest': 'swift-4.1-branch',
67+
'llbuild': 'master',
68+
'swiftpm': 'master',
69+
'swift-corelibs-libdispatch': 'master',
70+
'swift-corelibs-foundation': 'master',
71+
'swift-corelibs-xctest': 'master',
7272
},
7373
'swift-4.0-branch': {
7474
'llvm': 'swift-4.0-branch',

‎projects.json

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,8 @@
619619
"compatibility": {
620620
"4.2": {
621621
"branch": {
622-
"master": "https://bugs.swift.org/browse/SR-8307"
622+
"master": "https://bugs.swift.org/browse/SR-8307",
623+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307"
623624
}
624625
}
625626
}
@@ -660,7 +661,8 @@
660661
"compatibility": {
661662
"4.0": {
662663
"branch": {
663-
"master": "https://bugs.swift.org/browse/SR-8307"
664+
"master": "https://bugs.swift.org/browse/SR-8307",
665+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307"
664666
}
665667
},
666668
"4.1": {
@@ -719,7 +721,8 @@
719721
"compatibility": {
720722
"4.2": {
721723
"branch": {
722-
"master": "https://bugs.swift.org/browse/SR-9151"
724+
"master": "https://bugs.swift.org/browse/SR-9151",
725+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9151"
723726
}
724727
}
725728
}
@@ -756,7 +759,8 @@
756759
"compatibility": {
757760
"4.0": {
758761
"branch": {
759-
"master": "https://bugs.swift.org/browse/SR-8250"
762+
"master": "https://bugs.swift.org/browse/SR-8250",
763+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
760764
}
761765
}
762766
}
@@ -998,7 +1002,8 @@
9981002
"compatibility": {
9991003
"3.0": {
10001004
"branch": {
1001-
"master": "https://bugs.swift.org/browse/SR-8270"
1005+
"master": "https://bugs.swift.org/browse/SR-8270",
1006+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270"
10021007
}
10031008
}
10041009
}
@@ -1014,7 +1019,8 @@
10141019
"compatibility": {
10151020
"3.0": {
10161021
"branch": {
1017-
"master": "https://bugs.swift.org/browse/SR-8270"
1022+
"master": "https://bugs.swift.org/browse/SR-8270",
1023+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270"
10181024
}
10191025
}
10201026
}
@@ -1175,7 +1181,8 @@
11751181
"compatibility": {
11761182
"4.0": {
11771183
"branch": {
1178-
"master": "https://bugs.swift.org/browse/SR-8234"
1184+
"master": "https://bugs.swift.org/browse/SR-8234",
1185+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8234"
11791186
}
11801187
}
11811188
}
@@ -1212,7 +1219,8 @@
12121219
"compatibility": {
12131220
"4.2": {
12141221
"branch": {
1215-
"master": "https://bugs.swift.org/browse/SR-9102"
1222+
"master": "https://bugs.swift.org/browse/SR-9102",
1223+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9102"
12161224
}
12171225
}
12181226
}
@@ -1309,7 +1317,8 @@
13091317
"compatibility": {
13101318
"4.1": {
13111319
"branch": {
1312-
"master": "https://bugs.swift.org/browse/SR-9068"
1320+
"master": "https://bugs.swift.org/browse/SR-9068",
1321+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
13131322
}
13141323
}
13151324
}
@@ -1325,7 +1334,8 @@
13251334
"compatibility": {
13261335
"4.1": {
13271336
"branch": {
1328-
"master": "https://bugs.swift.org/browse/SR-9068"
1337+
"master": "https://bugs.swift.org/browse/SR-9068",
1338+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
13291339
}
13301340
}
13311341
}
@@ -1341,7 +1351,8 @@
13411351
"compatibility": {
13421352
"4.1": {
13431353
"branch": {
1344-
"master": "https://bugs.swift.org/browse/SR-9068"
1354+
"master": "https://bugs.swift.org/browse/SR-9068",
1355+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
13451356
}
13461357
}
13471358
}
@@ -1357,7 +1368,8 @@
13571368
"compatibility": {
13581369
"4.1": {
13591370
"branch": {
1360-
"master": "https://bugs.swift.org/browse/SR-9068"
1371+
"master": "https://bugs.swift.org/browse/SR-9068",
1372+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
13611373
}
13621374
}
13631375
}
@@ -1370,7 +1382,8 @@
13701382
"compatibility": {
13711383
"4.1": {
13721384
"branch": {
1373-
"master": "https://bugs.swift.org/browse/SR-9068"
1385+
"master": "https://bugs.swift.org/browse/SR-9068",
1386+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
13741387
}
13751388
}
13761389
}
@@ -1544,7 +1557,8 @@
15441557
"compatibility": {
15451558
"4.2": {
15461559
"branch": {
1547-
"master": "https://bugs.swift.org/browse/SR-8250"
1560+
"master": "https://bugs.swift.org/browse/SR-8250",
1561+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
15481562
}
15491563
}
15501564
}
@@ -1653,6 +1667,7 @@
16531667
"4.2": {
16541668
"branch": {
16551669
"master": "https://bugs.swift.org/browse/SR-9139",
1670+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9139",
16561671
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-9139"
16571672
}
16581673
}
@@ -2136,7 +2151,8 @@
21362151
"compatibility": {
21372152
"4.2": {
21382153
"branch": {
2139-
"master": "https://bugs.swift.org/browse/SR-8250"
2154+
"master": "https://bugs.swift.org/browse/SR-8250",
2155+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
21402156
}
21412157
}
21422158
}
@@ -2169,6 +2185,7 @@
21692185
"4.0": {
21702186
"branch": {
21712187
"master": "https://bugs.swift.org/browse/SR-8046",
2188+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8046",
21722189
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8046"
21732190
}
21742191
}
@@ -2671,7 +2688,8 @@
26712688
"compatibility": {
26722689
"3.1": {
26732690
"branch": {
2674-
"master": "https://bugs.swift.org/browse/SR-8250"
2691+
"master": "https://bugs.swift.org/browse/SR-8250",
2692+
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
26752693
}
26762694
}
26772695
}

0 commit comments

Comments
 (0)