Fix GraphViz, silence retroactive conformance warnings.

Signed-off-by: furby™ <[email protected]>
wabiverse · Aug 13, 2024 · 91d0082 · 91d0082
1 parent adbf99b
commit 91d0082
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -12,11 +12,11 @@
       },
       {
         "package": "GraphViz",
-        "repositoryURL": "https://github.com/SwiftDocOrg/GraphViz.git",
+        "repositoryURL": "https://github.com/wabiverse/GraphViz.git",
         "state": {
           "branch": null,
-          "revision": "70bebcf4597b9ce33e19816d6bbd4ba9b7bdf038",
-          "version": "0.2.0"
+          "revision": "88a69428f5e9aa926621851ea526ee5e03672046",
+          "version": "0.5.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -1,10 +1,10 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 
 import PackageDescription
 
 let package = Package(
     name: "XcodeGen",
-    platforms: [.macOS(.v10_13)],
+    platforms: [.macOS(.v10_15)],
     products: [
         .executable(name: "xcodegen", targets: ["XcodeGen"]),
         .library(name: "XcodeGenKit", targets: ["XcodeGenKit"]),
@@ -19,7 +19,7 @@ let package = Package(
         .package(url: "https://github.com/stackotter/SwiftXcodeProj.git", from: "8.10.1"),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
-        .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .exact("0.2.0")),
+        .package(url: "https://github.com/wabiverse/GraphViz.git", from: "0.5.0"),
     ],
 
     targets: [

diff --git a/Sources/ProjectSpec/Scheme.swift b/Sources/ProjectSpec/Scheme.swift
@@ -848,7 +848,7 @@ extension Scheme.Build: JSONEncodable {
     }
 }
 
-extension BuildType: JSONPrimitiveConvertible {
+extension BuildType: JSONUtilities.JSONPrimitiveConvertible {
 
     public typealias JSONType = String
 
@@ -880,7 +880,7 @@ extension BuildType: JSONEncodable {
     }
 }
 
-extension XCScheme.EnvironmentVariable: JSONObjectConvertible {
+extension XCScheme.EnvironmentVariable: JSONUtilities.JSONObjectConvertible {
     public static let enabledDefault = true
 
     private static func parseValue(_ value: Any) -> String {

diff --git a/Sources/ProjectSpec/SwiftPackage.swift b/Sources/ProjectSpec/SwiftPackage.swift
@@ -101,7 +101,7 @@ extension SwiftPackage: JSONEncodable {
     }
 }
 
-extension SwiftPackage.VersionRequirement: JSONObjectConvertible {
+extension SwiftPackage.VersionRequirement: JSONUtilities.JSONObjectConvertible {
 
     public init(jsonDictionary: JSONDictionary) throws {
         if jsonDictionary["exactVersion"] != nil {

diff --git a/Sources/ProjectSpec/VersionExtensions.swift b/Sources/ProjectSpec/VersionExtensions.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Version
 
-extension Version: ExpressibleByStringLiteral {
+extension Version: Swift.ExpressibleByStringLiteral {
 
     public static func parse(_ string: String) throws -> Version {
         if let version = Version(tolerant: string) {

diff --git a/Sources/XcodeGenCLI/Arguments.swift b/Sources/XcodeGenCLI/Arguments.swift
@@ -2,7 +2,7 @@ import Foundation
 import PathKit
 import SwiftCLI
 
-extension Path: ConvertibleFromString {
+extension Path: SwiftCLI.ConvertibleFromString {
 
     public init?(input: String) {
         self.init(input)

diff --git a/Sources/XcodeGenKit/CarthageVersionLoader.swift b/Sources/XcodeGenKit/CarthageVersionLoader.swift
@@ -73,7 +73,7 @@ struct CarthageVersionFile: Decodable {
     }
 }
 
-extension Platform: CodingKey {
+extension Platform: Swift.CodingKey {
 
     public var stringValue: String {
         carthageName

diff --git a/Sources/XcodeGenKit/GraphVizGenerator.swift b/Sources/XcodeGenKit/GraphVizGenerator.swift
@@ -1,4 +1,3 @@
-import DOT
 import Foundation
 import GraphViz
 import ProjectSpec
@@ -14,7 +13,7 @@ extension Dependency {
     }
 }
 
-extension Dependency.DependencyType: CustomStringConvertible {
+extension Dependency.DependencyType: Swift.CustomStringConvertible {
     public var description: String {
         switch self {
         case .bundle: return "bundle"