Updated Dependencies (#5)

* Updated Dependencies (Swift Argument Parser) * Updated GitHub Checkout Action
richardpiazza · Aug 20, 2024 · cf17d33 · cf17d33
1 parent df17ac7
commit cf17d33
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 46 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Build (macOS)
       run: swift build -v
     - name: Run tests
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Build (Ubuntu)
       run: swift build -v
     - name: Run tests

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
-          "version": "1.2.2"
+          "revision": "41982a3656a71c768319979febd796c6fd111d5c",
+          "version": "1.5.0"
         }
       },
       {
         "package": "Swift2D",
         "repositoryURL": "https://github.com/richardpiazza/Swift2D.git",
         "state": {
           "branch": null,
-          "revision": "4df6f74d3e3ad11075ea53fbb13fceda7c60b7b6",
-          "version": "2.0.0"
+          "revision": "f9e993c0075013339c5c132ab01fc78750b8774f",
+          "version": "2.1.0"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/richardpiazza/SwiftSVG",
         "state": {
           "branch": null,
-          "revision": "2f5b4418f49b56c95265ae5ada1ef6bd8cccec68",
-          "version": "0.10.0"
+          "revision": "7238a601fc0e074543e3fa1b1912bf7afa9d32bf",
+          "version": "0.11.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -1,14 +1,16 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "VectorPlus",
     platforms: [
-        .macOS(.v10_15),
-        .iOS(.v13),
-        .tvOS(.v13),
+        .macOS(.v12),
+        .macCatalyst(.v15),
+        .iOS(.v15),
+        .tvOS(.v15),
+        .watchOS(.v8),
     ],
     products: [
         .executable(
@@ -21,28 +23,35 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
-        .package(url: "https://github.com/richardpiazza/SwiftSVG", from: "0.10.0"),
-        .package(url: "https://github.com/richardpiazza/SwiftColor", from: "0.2.0"),
-        .package(url: "https://github.com/JohnSundell/ShellOut", from: "2.3.0"),
+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.5.0")),
+        .package(url: "https://github.com/richardpiazza/SwiftSVG.git", .upToNextMajor(from: "0.11.0")),
+        .package(url: "https://github.com/richardpiazza/SwiftColor.git", .upToNextMajor(from: "0.2.0")),
+        .package(url: "https://github.com/JohnSundell/ShellOut.git", .upToNextMajor(from: "2.3.0")),
     ],
     targets: [
-        .target(
+        .executableTarget(
             name: "Executable",
             dependencies: [
-                "SwiftSVG",
                 "VectorPlus",
+                .product(name: "SwiftSVG", package: "SwiftSVG"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "ShellOut", package: "ShellOut"),
             ]
         ),
         .target(
             name: "VectorPlus",
-            dependencies: ["SwiftSVG", "SwiftColor"]
+            dependencies: [
+                .product(name: "SwiftSVG", package: "SwiftSVG"),
+                .product(name: "SwiftColor", package: "SwiftColor"),
+            ]
         ),
         .testTarget(
             name: "VectorPlusTests",
-            dependencies: ["Executable", "SwiftSVG", "VectorPlus"]
+            dependencies: [
+                "Executable",
+                "VectorPlus",
+                .product(name: "SwiftSVG", package: "SwiftSVG"),
+            ]
         ),
     ]
 )
diff --git a/Sources/Executable/AppDelegate.swift b/Sources/Executable/AppDelegate.swift
@@ -47,5 +47,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         return true
     }
 }
-
 #endif
diff --git a/Sources/Executable/Convert.swift b/Sources/Executable/Convert.swift
@@ -25,12 +25,7 @@ struct Convert: ParsableCommand {
         return CommandConfiguration(
             commandName: "convert",
             abstract: "Transforms an SVG file to a specific output",
-            usage: nil,
             discussion: discussion,
-            version: "",
-            shouldDisplay: true,
-            subcommands: [],
-            defaultSubcommand: nil,
             helpNames: [.short, .long]
         )
     }()

diff --git a/Sources/Executable/Inspect.swift b/Sources/Executable/Inspect.swift
@@ -13,12 +13,7 @@ struct Inspect: ParsableCommand {
         return CommandConfiguration(
             commandName: "inspect",
             abstract: "Parses an SVG file and displays the interpretation.",
-            usage: nil,
             discussion: discussion,
-            version: "",
-            shouldDisplay: true,
-            subcommands: [],
-            defaultSubcommand: nil,
             helpNames: [.short, .long]
         )
     }()

diff --git a/Sources/Executable/Preview.swift b/Sources/Executable/Preview.swift
@@ -17,12 +17,7 @@ struct Preview: ParsableCommand {
         return CommandConfiguration(
             commandName: "preview",
             abstract: "Preview the interpretation of an SVG document",
-            usage: nil,
             discussion: discussion,
-            version: "",
-            shouldDisplay: true,
-            subcommands: [],
-            defaultSubcommand: nil,
             helpNames: [.short, .long]
         )
     }()
@@ -50,5 +45,4 @@ struct Preview: ParsableCommand {
         app.run()
     }
 }
-
 #endif
diff --git a/Sources/Executable/Render.swift b/Sources/Executable/Render.swift
@@ -18,12 +18,7 @@ struct Render: ParsableCommand {
         return CommandConfiguration(
             commandName: "render",
             abstract: "Renders an SVG document to a PNG file",
-            usage: nil,
             discussion: discussion,
-            version: "",
-            shouldDisplay: true,
-            subcommands: [],
-            defaultSubcommand: nil,
             helpNames: [.short, .long]
         )
     }()
@@ -60,5 +55,4 @@ struct Render: ParsableCommand {
         try shellOut(to: .openFile(at: outputURL.absoluteString))
     }
 }
-
 #endif
diff --git a/Sources/Executable/main.swift b/Sources/Executable/main.swift
@@ -19,10 +19,8 @@ struct Command: ParsableCommand {
         return CommandConfiguration(
             commandName: "vectorplus",
             abstract: "A utility for manipulating SVG documents.",
-            usage: nil,
             discussion: discussion,
             version: "1.0.0",
-            shouldDisplay: true,
             subcommands: subcommands,
             defaultSubcommand: Inspect.self,
             helpNames: [.short, .long]

diff --git a/Sources/VectorPlus/Color+VectorPlus.swift → Sources/VectorPlus/Pigment+VectorPlus.swift b/Sources/VectorPlus/Color+VectorPlus.swift → Sources/VectorPlus/Pigment+VectorPlus.swift
diff --git a/Sources/VectorPlus/SwiftUI/SwiftUI.Color+VectorPlus.swift b/Sources/VectorPlus/SwiftUI/SwiftUI.Color+VectorPlus.swift
@@ -4,7 +4,7 @@ import SwiftUI
 
 extension SwiftUI.Color {
     static func make(_ color: SwiftColor.Pigment) -> SwiftUI.Color {
-        SwiftUI.Color(red: Double(color.red), green: Double(color.green), blue: Double(color.blue)).opacity(Double(color.alpha))
+        SwiftUI.Color(red: color.red, green: color.green, blue: color.blue).opacity(color.alpha)
     }
 }
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,5 +47,4 @@ class AppDelegate: NSObject, NSApplicationDelegate { @@
             return true
         }
     }
     #endif