Revert JSON format change and fix bug introduced by #3696 (#3793)

finagolfin · web-flow · commit 2f781b423b1d · 2021-10-06T14:44:03.000-07:00
diff --git a/Sources/Workspace/Destination.swift b/Sources/Workspace/Destination.swift
@@ -225,7 +225,7 @@ extension Destination {
             binDir: destination.binDir,
             extraCCFlags: destination.extraCCFlags,
             extraSwiftCFlags: destination.extraSwiftCFlags,
-            extraCPPFlags: destination.extraCCFlags
+            extraCPPFlags: destination.extraCPPFlags
         )
     }
 }
@@ -241,4 +241,13 @@ fileprivate struct DestinationInfo: Codable {
     let extraCCFlags: [String]
     let extraSwiftCFlags: [String]
     let extraCPPFlags: [String]
+
+    enum CodingKeys: String, CodingKey {
+        case target
+        case sdk
+        case binDir = "toolchain-bin-dir"
+        case extraCCFlags = "extra-cc-flags"
+        case extraSwiftCFlags = "extra-swiftc-flags"
+        case extraCPPFlags = "extra-cpp-flags"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ extension Destination {`
`225`	`225`	`binDir: destination.binDir,`
`226`	`226`	`extraCCFlags: destination.extraCCFlags,`
`227`	`227`	`extraSwiftCFlags: destination.extraSwiftCFlags,`
`228`		`- extraCPPFlags: destination.extraCCFlags`
	`228`	`+ extraCPPFlags: destination.extraCPPFlags`
`229`	`229`	`)`
`230`	`230`	`}`
`231`	`231`	`}`
`@@ -241,4 +241,13 @@ fileprivate struct DestinationInfo: Codable {`
`241`	`241`	`let extraCCFlags: [String]`
`242`	`242`	`let extraSwiftCFlags: [String]`
`243`	`243`	`let extraCPPFlags: [String]`
	`244`	`+`
	`245`	`+ enum CodingKeys: String, CodingKey {`
	`246`	`+ case target`
	`247`	`+ case sdk`
	`248`	`+ case binDir = "toolchain-bin-dir"`
	`249`	`+ case extraCCFlags = "extra-cc-flags"`
	`250`	`+ case extraSwiftCFlags = "extra-swiftc-flags"`
	`251`	`+ case extraCPPFlags = "extra-cpp-flags"`
	`252`	`+ }`
`244`	`253`	`}`