Merge pull request swiftlang#156 from apple/add-swift-4.2-support

shahmishal · web-flow · commit c9a18093e3fd · 2018-03-06T16:22:32.000-08:00
Add support for swift 4.2 branch
diff --git a/common.py b/common.py
@@ -38,6 +38,19 @@
         'swift-corelibs-foundation': 'master',
         'swift-corelibs-xctest': 'master',
     },
+    'swift-4.2-branch': {
+        'llvm': 'swift-4.1-branch',
+        'clang': 'swift-4.1-branch',
+        'compiler-rt': 'swift-4.1-branch',
+        'swift': 'swift-4.2-branch',
+        'cmark': 'master',
+        'ninja': 'release',
+        'llbuild': 'master',
+        'swiftpm': 'master',
+        'swift-corelibs-libdispatch': 'master',
+        'swift-corelibs-foundation': 'master',
+        'swift-corelibs-xctest': 'master',
+    },
     'swift-5.0-branch': {
         'llvm': 'swift-4.1-branch',
         'clang': 'swift-4.1-branch',
diff --git a/projects.json b/projects.json
@@ -964,6 +964,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6748",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6748",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6748",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6748"
               }
             }
@@ -1329,6 +1330,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6618",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"
               }
             }
@@ -1347,6 +1349,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6618",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"
               }
             }
@@ -1365,6 +1368,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6618",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"
               }
             }
@@ -1383,6 +1387,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6618",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"
               }
             }
@@ -1406,6 +1411,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6618",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"
               }
             }
@@ -1615,6 +1621,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6658",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"
               }
             }
@@ -1633,6 +1640,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6658",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"
               }
             }
@@ -1651,6 +1659,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6658",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"
               }
             }
@@ -1669,6 +1678,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6658",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"
               }
             }
@@ -1764,6 +1774,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6538",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"
               }
             }
@@ -1782,6 +1793,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6538",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"
               }
             }
@@ -1800,6 +1812,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6538",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"
               }
             }
@@ -1818,6 +1831,7 @@
               "branch": {
                 "master": "https://bugs.swift.org/browse/SR-6538",
                 "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",
+                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",
                 "swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -964,6 +964,7 @@`
`964`	`964`	`"branch": {`
`965`	`965`	`"master": "https://bugs.swift.org/browse/SR-6748",`
`966`	`966`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6748",`
	`967`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6748",`
`967`	`968`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6748"`
`968`	`969`	`}`
`969`	`970`	`}`
`@@ -1329,6 +1330,7 @@`
`1329`	`1330`	`"branch": {`
`1330`	`1331`	`"master": "https://bugs.swift.org/browse/SR-6618",`
`1331`	`1332`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",`
	`1333`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",`
`1332`	`1334`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"`
`1333`	`1335`	`}`
`1334`	`1336`	`}`
`@@ -1347,6 +1349,7 @@`
`1347`	`1349`	`"branch": {`
`1348`	`1350`	`"master": "https://bugs.swift.org/browse/SR-6618",`
`1349`	`1351`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",`
	`1352`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",`
`1350`	`1353`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"`
`1351`	`1354`	`}`
`1352`	`1355`	`}`
`@@ -1365,6 +1368,7 @@`
`1365`	`1368`	`"branch": {`
`1366`	`1369`	`"master": "https://bugs.swift.org/browse/SR-6618",`
`1367`	`1370`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",`
	`1371`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",`
`1368`	`1372`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"`
`1369`	`1373`	`}`
`1370`	`1374`	`}`
`@@ -1383,6 +1387,7 @@`
`1383`	`1387`	`"branch": {`
`1384`	`1388`	`"master": "https://bugs.swift.org/browse/SR-6618",`
`1385`	`1389`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",`
	`1390`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",`
`1386`	`1391`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"`
`1387`	`1392`	`}`
`1388`	`1393`	`}`
`@@ -1406,6 +1411,7 @@`
`1406`	`1411`	`"branch": {`
`1407`	`1412`	`"master": "https://bugs.swift.org/browse/SR-6618",`
`1408`	`1413`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6618",`
	`1414`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6618",`
`1409`	`1415`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6618"`
`1410`	`1416`	`}`
`1411`	`1417`	`}`
`@@ -1615,6 +1621,7 @@`
`1615`	`1621`	`"branch": {`
`1616`	`1622`	`"master": "https://bugs.swift.org/browse/SR-6658",`
`1617`	`1623`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",`
	`1624`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",`
`1618`	`1625`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"`
`1619`	`1626`	`}`
`1620`	`1627`	`}`
`@@ -1633,6 +1640,7 @@`
`1633`	`1640`	`"branch": {`
`1634`	`1641`	`"master": "https://bugs.swift.org/browse/SR-6658",`
`1635`	`1642`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",`
	`1643`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",`
`1636`	`1644`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"`
`1637`	`1645`	`}`
`1638`	`1646`	`}`
`@@ -1651,6 +1659,7 @@`
`1651`	`1659`	`"branch": {`
`1652`	`1660`	`"master": "https://bugs.swift.org/browse/SR-6658",`
`1653`	`1661`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",`
	`1662`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",`
`1654`	`1663`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"`
`1655`	`1664`	`}`
`1656`	`1665`	`}`
`@@ -1669,6 +1678,7 @@`
`1669`	`1678`	`"branch": {`
`1670`	`1679`	`"master": "https://bugs.swift.org/browse/SR-6658",`
`1671`	`1680`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6658",`
	`1681`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6658",`
`1672`	`1682`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6658"`
`1673`	`1683`	`}`
`1674`	`1684`	`}`
`@@ -1764,6 +1774,7 @@`
`1764`	`1774`	`"branch": {`
`1765`	`1775`	`"master": "https://bugs.swift.org/browse/SR-6538",`
`1766`	`1776`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",`
	`1777`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",`
`1767`	`1778`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"`
`1768`	`1779`	`}`
`1769`	`1780`	`}`
`@@ -1782,6 +1793,7 @@`
`1782`	`1793`	`"branch": {`
`1783`	`1794`	`"master": "https://bugs.swift.org/browse/SR-6538",`
`1784`	`1795`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",`
	`1796`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",`
`1785`	`1797`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"`
`1786`	`1798`	`}`
`1787`	`1799`	`}`
`@@ -1800,6 +1812,7 @@`
`1800`	`1812`	`"branch": {`
`1801`	`1813`	`"master": "https://bugs.swift.org/browse/SR-6538",`
`1802`	`1814`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",`
	`1815`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",`
`1803`	`1816`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"`
`1804`	`1817`	`}`
`1805`	`1818`	`}`
`@@ -1818,6 +1831,7 @@`
`1818`	`1831`	`"branch": {`
`1819`	`1832`	`"master": "https://bugs.swift.org/browse/SR-6538",`
`1820`	`1833`	`"swift-4.1-branch": "https://bugs.swift.org/browse/SR-6538",`
	`1834`	`+ "swift-4.2-branch": "https://bugs.swift.org/browse/SR-6538",`
`1821`	`1835`	`"swift-5.0-branch": "https://bugs.swift.org/browse/SR-6538"`
`1822`	`1836`	`}`
`1823`	`1837`	`}`