diff --git a/Package.swift b/Package.swift index f81064cc..619f72d8 100644 --- a/Package.swift +++ b/Package.swift @@ -16,48 +16,25 @@ let package = Package( .executable(name: "publish-cli", targets: ["PublishCLI"]) ], dependencies: [ - .package( - name: "Ink", - url: "https://github.com/johnsundell/ink.git", - from: "0.2.0" - ), - .package( - name: "Plot", - url: "https://github.com/johnsundell/plot.git", - from: "0.9.0" - ), - .package( - name: "Files", - url: "https://github.com/johnsundell/files.git", - from: "4.0.0" - ), - .package( - name: "Codextended", - url: "https://github.com/johnsundell/codextended.git", - from: "0.1.0" - ), - .package( - name: "ShellOut", - url: "https://github.com/johnsundell/shellout.git", - from: "2.3.0" - ), - .package( - name: "Sweep", - url: "https://github.com/johnsundell/sweep.git", - from: "0.4.0" - ), - .package( - name: "CollectionConcurrencyKit", - url: "https://github.com/johnsundell/collectionConcurrencyKit.git", - from: "0.1.0" - ) + .package(url: "https://github.com/johnsundell/ink.git", from: "0.2.0"), + .package(url: "https://github.com/johnsundell/plot.git", from: "0.9.0"), + .package(url: "https://github.com/johnsundell/files.git", from: "4.0.0"), + .package(url: "https://github.com/johnsundell/codextended.git", from: "0.1.0"), + .package(url: "https://github.com/johnsundell/shellout.git", from: "2.3.0"), + .package(url: "https://github.com/johnsundell/sweep.git", from: "0.4.0"), + .package(url: "https://github.com/johnsundell/collectionConcurrencyKit.git", from: "0.1.0") ], targets: [ .target( name: "Publish", dependencies: [ - "Ink", "Plot", "Files", "Codextended", - "ShellOut", "Sweep", "CollectionConcurrencyKit" + .product(name: "Ink", package: "ink"), + .product(name: "Plot", package: "plot"), + .product(name: "Files", package: "files"), + .product(name: "Codextended", package: "codextended"), + .product(name: "ShellOut", package: "shellout"), + .product(name: "Sweep", package: "sweep"), + .product(name: "CollectionConcurrencyKit", package: "collectionConcurrencyKit") ] ), .executableTarget( diff --git a/Sources/PublishCLICore/ProjectGenerator.swift b/Sources/PublishCLICore/ProjectGenerator.swift index 3c6db573..71f5489f 100644 --- a/Sources/PublishCLICore/ProjectGenerator.swift +++ b/Sources/PublishCLICore/ProjectGenerator.swift @@ -115,12 +115,14 @@ private extension ProjectGenerator { ) ], dependencies: [ - .package(name: "Publish", \(dependencyString)) + .package(\(dependencyString)) ], targets: [ .executableTarget( name: "\(name)", - dependencies: ["Publish"] + dependencies: [ + .product(name: "Publish", package: "publish") + ] ) ] )