Merge pull request swiftlang#113 from apple/34812868

lplarson · web-flow · commit 9d9e2ee5b177 · 2017-12-06T12:00:16.000-08:00
Resolve Kitura XFAIL
diff --git a/projects.json b/projects.json
@@ -839,8 +839,8 @@
     "branch": "master",
     "maintainer": "navneet@us.ibm.com",
     "compatibility": {
-      "3.0": {
-        "commit": "5ebf8f63fe6ab1fd2f50de860e19a07661fbb974"
+      "4.0": {
+        "commit": "edbd229ba8b99db936bc552c8e4f8e190a6dc633"
       }
     },
     "platforms": [
@@ -853,10 +853,10 @@
         "configuration": "release",
         "xfail": {
           "compatibility": {
-            "3.0": {
+            "4.0": {
               "branch": {
-                "master": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable",
-                "swift-4.1-branch": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable"
+                "master": "https://bugs.swift.org/browse/SR-6539",
+                "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6539"
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -839,8 +839,8 @@`
`839`	`839`	`"branch": "master",`
`840`	`840`	`"maintainer": "[email protected]",`
`841`	`841`	`"compatibility": {`
`842`		`- "3.0": {`
`843`		`- "commit": "5ebf8f63fe6ab1fd2f50de860e19a07661fbb974"`
	`842`	`+ "4.0": {`
	`843`	`+ "commit": "edbd229ba8b99db936bc552c8e4f8e190a6dc633"`
`844`	`844`	`}`
`845`	`845`	`},`
`846`	`846`	`"platforms": [`
`@@ -853,10 +853,10 @@`
`853`	`853`	`"configuration": "release",`
`854`	`854`	`"xfail": {`
`855`	`855`	`"compatibility": {`
`856`		`- "3.0": {`
	`856`	`+ "4.0": {`
`857`	`857`	`"branch": {`
`858`		`- "master": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable",`
`859`		`- "swift-4.1-branch": "<rdar://problem/34812868> Kitura is using an old version of SwiftyJSON that references _Incrementable"`
	`858`	`+ "master": "https://bugs.swift.org/browse/SR-6539",`
	`859`	`+ "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6539"`
`860`	`860`	`}`
`861`	`861`	`}`
`862`	`862`	`}`