Skip to content

Commit

Permalink
Merge pull request swiftlang#282 from apple/add-swift-5-support
Browse files Browse the repository at this point in the history 
Add support for Swift 5.0 branch
  • Loading branch information
@shahmishal
shahmishal authored Nov 2, 2018
2 parents 7041c62 + bb085d4 commit 8d944fd
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 24 deletions.
16 changes: 8 additions & 8 deletions common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@
'swift-corelibs-xctest': 'swift-4.2-branch',
},
'swift-5.0-branch': {
'llvm': 'swift-4.1-branch',
'clang': 'swift-4.1-branch',
'compiler-rt': 'swift-4.1-branch',
'llvm': 'swift-5.0-branch',
'clang': 'swift-5.0-branch',
'compiler-rt': 'swift-5.0-branch',
'swift': 'swift-5.0-branch',
'cmark': 'master',
'ninja': 'release',
'llbuild': 'swift-4.1-branch',
'swiftpm': 'swift-4.1-branch',
'swift-corelibs-libdispatch': 'swift-4.1-branch',
'swift-corelibs-foundation': 'swift-4.1-branch',
'swift-corelibs-xctest': 'swift-4.1-branch',
'llbuild': 'master',
'swiftpm': 'master',
'swift-corelibs-libdispatch': 'master',
'swift-corelibs-foundation': 'master',
'swift-corelibs-xctest': 'master',
},
'swift-4.0-branch': {
'llvm': 'swift-4.0-branch',
Expand Down
50 changes: 34 additions & 16 deletions projects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@
"compatibility": {
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8307"
"master": "https://bugs.swift.org/browse/SR-8307",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307"
}
}
}
Expand Down Expand Up @@ -660,7 +661,8 @@
"compatibility": {
"4.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8307"
"master": "https://bugs.swift.org/browse/SR-8307",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307"
}
},
"4.1": {
Expand Down Expand Up @@ -719,7 +721,8 @@
"compatibility": {
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9151"
"master": "https://bugs.swift.org/browse/SR-9151",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9151"
}
}
}
Expand Down Expand Up @@ -756,7 +759,8 @@
"compatibility": {
"4.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8250"
"master": "https://bugs.swift.org/browse/SR-8250",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
}
}
}
Expand Down Expand Up @@ -998,7 +1002,8 @@
"compatibility": {
"3.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8270"
"master": "https://bugs.swift.org/browse/SR-8270",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270"
}
}
}
Expand All @@ -1014,7 +1019,8 @@
"compatibility": {
"3.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8270"
"master": "https://bugs.swift.org/browse/SR-8270",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270"
}
}
}
Expand Down Expand Up @@ -1175,7 +1181,8 @@
"compatibility": {
"4.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8234"
"master": "https://bugs.swift.org/browse/SR-8234",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8234"
}
}
}
Expand Down Expand Up @@ -1212,7 +1219,8 @@
"compatibility": {
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9102"
"master": "https://bugs.swift.org/browse/SR-9102",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9102"
}
}
}
Expand Down Expand Up @@ -1309,7 +1317,8 @@
"compatibility": {
"4.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9068"
"master": "https://bugs.swift.org/browse/SR-9068",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
}
}
}
Expand All @@ -1325,7 +1334,8 @@
"compatibility": {
"4.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9068"
"master": "https://bugs.swift.org/browse/SR-9068",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
}
}
}
Expand All @@ -1341,7 +1351,8 @@
"compatibility": {
"4.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9068"
"master": "https://bugs.swift.org/browse/SR-9068",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
}
}
}
Expand All @@ -1357,7 +1368,8 @@
"compatibility": {
"4.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9068"
"master": "https://bugs.swift.org/browse/SR-9068",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
}
}
}
Expand All @@ -1370,7 +1382,8 @@
"compatibility": {
"4.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9068"
"master": "https://bugs.swift.org/browse/SR-9068",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068"
}
}
}
Expand Down Expand Up @@ -1544,7 +1557,8 @@
"compatibility": {
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8250"
"master": "https://bugs.swift.org/browse/SR-8250",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
}
}
}
Expand Down Expand Up @@ -1653,6 +1667,7 @@
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-9139",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-9139",
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-9139"
}
}
Expand Down Expand Up @@ -2136,7 +2151,8 @@
"compatibility": {
"4.2": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8250"
"master": "https://bugs.swift.org/browse/SR-8250",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
}
}
}
Expand Down Expand Up @@ -2169,6 +2185,7 @@
"4.0": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8046",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8046",
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8046"
}
}
Expand Down Expand Up @@ -2671,7 +2688,8 @@
"compatibility": {
"3.1": {
"branch": {
"master": "https://bugs.swift.org/browse/SR-8250"
"master": "https://bugs.swift.org/browse/SR-8250",
"swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250"
}
}
}
Expand Down

0 comments on commit 8d944fd

Please sign in to comment.