From 0fed472f6c4024382452a6291ae8fe73dacaff93 Mon Sep 17 00:00:00 2001 From: Daniela Hengl Date: Thu, 11 Jan 2024 14:40:47 +0100 Subject: [PATCH 1/5] -changed dependecy for swift macrotester to https url --- .gitignore | 2 ++ Package.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..19106d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.swiftpm +/Package.resolved diff --git a/Package.swift b/Package.swift index 5ff0c6e..45f8b57 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ) ], dependencies: [ - .package(path: "../MacroTester"), + .package(url: "https://github.com/num42/swift-macrotester.git", from: "1.0.0"), // Depend on the Swift 5.9 release of SwiftSyntax .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"), .package( From 286c50497a6820a7a1da1dc25cde435100d4c590 Mon Sep 17 00:00:00 2001 From: Daniela Hengl Date: Thu, 11 Jan 2024 16:16:19 +0100 Subject: [PATCH 2/5] - uncommented lines in Package file --- Package.swift | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/Package.swift b/Package.swift index 45f8b57..c62558a 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/num42/swift-macrotester.git", from: "1.0.0"), + .package(url: "git@github.com:num42/swift-macrotester.git", from: "1.0.0"), // Depend on the Swift 5.9 release of SwiftSyntax .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"), .package( @@ -36,33 +36,31 @@ let package = Package( dependencies: [ .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), .product(name: "SwiftCompilerPlugin", package: "swift-syntax") - ] -// plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] + ], + plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] ), // Library that exposes a macro as part of its API, which is used in client programs. .target( name: "Changeable", - dependencies: ["ChangeableMacros"] -// plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] + dependencies: ["ChangeableMacros"], + plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] ), // A client of the library, which is able to use the macro in its own code. .executableTarget( name: "ChangeableClient", - dependencies: ["Changeable"] -// plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] - ) - + dependencies: ["Changeable"], + plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] + ), // A test target used to develop the macro implementation. -// .testTarget( -// name: "ChangeableTests", -// dependencies: [ -// "ChangeableMacros", -// .product(name: "MacroTester", package: "MacroTester"), -// .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax") -// ] -// plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] -// ) + .testTarget( + name: "ChangeableTests", + dependencies: ["ChangeableMacros", + .product(name: "swift-macrotester", package: "swift-macrotester"), + .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax") + ], + plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")] + ) ] ) From 5bf4b6b5cf1ca58b78dc254d9360795dc1e9731e Mon Sep 17 00:00:00 2001 From: Daniela Hengl Date: Thu, 11 Jan 2024 16:21:50 +0100 Subject: [PATCH 3/5] -fixed import for swift-macrotester --- Tests/ChangeableTests/ChangeableTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ChangeableTests/ChangeableTests.swift b/Tests/ChangeableTests/ChangeableTests.swift index 80bf74d..571e75f 100644 --- a/Tests/ChangeableTests/ChangeableTests.swift +++ b/Tests/ChangeableTests/ChangeableTests.swift @@ -1,8 +1,8 @@ import ChangeableMacros -import MacroTester import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest +import swift_macrotester let testMacros: [String: Macro.Type] = [ "Changeable": ChangeableFunctionMacro.self From 43ba167d76cf9f1a2e6e7dfcb479fd7d838d9e71 Mon Sep 17 00:00:00 2001 From: Daniela Hengl Date: Fri, 12 Jan 2024 10:24:00 +0100 Subject: [PATCH 4/5] -changed import after renming macrotester back to MacroTester --- Tests/ChangeableTests/ChangeableTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ChangeableTests/ChangeableTests.swift b/Tests/ChangeableTests/ChangeableTests.swift index 571e75f..13f5aee 100644 --- a/Tests/ChangeableTests/ChangeableTests.swift +++ b/Tests/ChangeableTests/ChangeableTests.swift @@ -2,7 +2,7 @@ import ChangeableMacros import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest -import swift_macrotester +import MacroTester let testMacros: [String: Macro.Type] = [ "Changeable": ChangeableFunctionMacro.self From 96bb571053e0196be86ff0b66cf52a81be4546dc Mon Sep 17 00:00:00 2001 From: Daniela Hengl Date: Fri, 12 Jan 2024 10:58:28 +0100 Subject: [PATCH 5/5] - adjustments after renaming MacroTester --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c62558a..44c5148 100644 --- a/Package.swift +++ b/Package.swift @@ -57,7 +57,7 @@ let package = Package( .testTarget( name: "ChangeableTests", dependencies: ["ChangeableMacros", - .product(name: "swift-macrotester", package: "swift-macrotester"), + .product(name: "MacroTester", package: "swift-macrotester"), .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax") ], plugins: [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")]