diff --git a/Package.swift b/Package.swift index 441e55f..6e2b238 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.macOS(.v10_13)], products: [ .executable(name: "AirbnbSwiftFormatTool", targets: ["AirbnbSwiftFormatTool"]), - .plugin(name: "AirbnbSwiftFormatPlugin", targets: ["AirbnbSwiftFormatPlugin"]), + .plugin(name: "FormatSwift", targets: ["FormatSwift"]), ], dependencies: [ .package(url: "https://github.com/calda/SwiftFormat", exact: "0.49.11-beta-2"), @@ -18,7 +18,7 @@ let package = Package( ], targets: [ .plugin( - name: "AirbnbSwiftFormatPlugin", + name: "FormatSwift", capability: .command( intent: .custom( verb: "format", @@ -30,14 +30,12 @@ let package = Package( "AirbnbSwiftFormatTool", .product(name: "swiftformat", package: "SwiftFormat"), .product(name: "swiftlint", package: "SwiftLint"), - ], - path: "AirbnbSwiftFormatPlugin"), + ]), .executableTarget( name: "AirbnbSwiftFormatTool", dependencies: [ .product(name: "ArgumentParser", package: "swift-argument-parser"), ], - path: "AirbnbSwiftFormatTool", resources: [ .process("airbnb.swiftformat"), .process("swiftlint.yml"), diff --git a/AirbnbSwiftFormatPlugin/AirbnbSwiftFormatPlugin.swift b/Plugins/FormatSwift/Plugin.swift similarity index 100% rename from AirbnbSwiftFormatPlugin/AirbnbSwiftFormatPlugin.swift rename to Plugins/FormatSwift/Plugin.swift diff --git a/AirbnbSwiftFormatTool/AirbnbSwiftFormatTool.swift b/Sources/AirbnbSwiftFormatTool/AirbnbSwiftFormatTool.swift similarity index 100% rename from AirbnbSwiftFormatTool/AirbnbSwiftFormatTool.swift rename to Sources/AirbnbSwiftFormatTool/AirbnbSwiftFormatTool.swift diff --git a/AirbnbSwiftFormatTool/airbnb.swiftformat b/Sources/AirbnbSwiftFormatTool/airbnb.swiftformat similarity index 100% rename from AirbnbSwiftFormatTool/airbnb.swiftformat rename to Sources/AirbnbSwiftFormatTool/airbnb.swiftformat diff --git a/AirbnbSwiftFormatTool/swiftlint.yml b/Sources/AirbnbSwiftFormatTool/swiftlint.yml similarity index 100% rename from AirbnbSwiftFormatTool/swiftlint.yml rename to Sources/AirbnbSwiftFormatTool/swiftlint.yml