Skip to content

Introduce traits guarding dependencies that macros and -tool use #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ktoso wants to merge 1 commit into
base: main
Choose a base branch
from
+82 −17
Draft

Introduce traits guarding dependencies that macros and -tool use #468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 82 additions & 17 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,20 @@ let package = Package(
type: .dynamic,
targets: ["ExampleSwiftLibrary"]
),
],
traits: [
// guards dependencies pulled by the swift-java tool (source generator)
.trait(name: "_SwiftJavaToolDependencyGuardTrait", enabledTraits: []),

// guards dependencies pulled by the SwiftJava target to support `@Java...` macros
.trait(name: "_SwiftJavaMacrosDependencyGuardTrait", enabledTraits: []),

.default(enabledTraits: [
"_SwiftJavaToolDependencyGuardTrait",
"_SwiftJavaMacrosDependencyGuardTrait",
])
],

dependencies: [
.package(url: "https://github.com/swiftlang/swift-syntax", from: "602.0.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
Expand Down Expand Up @@ -231,8 +243,16 @@ let package = Package(
.macro(
name: "SwiftJavaMacros",
dependencies: [
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
.product(
name: "SwiftSyntaxMacros",
package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaMacrosDependencyGuardTrait"])
),
.product(
name: "SwiftCompilerPlugin",
package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaMacrosDependencyGuardTrait"])
),
],
swiftSettings: [
.swiftLanguageMode(.v5)
Expand Down Expand Up @@ -403,11 +423,26 @@ let package = Package(
.target(
name: "SwiftJavaToolLib",
dependencies: [
.product(name: "Logging", package: "swift-log"),
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "SwiftBasicFormat", package: "swift-syntax"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
.product(
name: "Logging", package: "swift-log",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "OrderedCollections", package: "swift-collections",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftBasicFormat", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntax", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntaxBuilder", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
"SwiftJava",
"JavaUtilJar",
"JavaLangReflect",
Expand All @@ -428,11 +463,26 @@ let package = Package(
.executableTarget(
name: "SwiftJavaTool",
dependencies: [
.product(name: "SwiftBasicFormat", package: "swift-syntax"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SystemPackage", package: "swift-system"),
.product(
name: "SwiftBasicFormat", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntax", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntaxBuilder", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "ArgumentParser", package: "swift-argument-parser",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SystemPackage", package: "swift-system",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
"SwiftJava",
"JavaUtilJar",
"JavaNet",
Expand All @@ -455,11 +505,26 @@ let package = Package(
.target(
name: "JExtractSwiftLib",
dependencies: [
.product(name: "SwiftBasicFormat", package: "swift-syntax"),
.product(name: "SwiftLexicalLookup", package: "swift-syntax"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(
name: "SwiftBasicFormat", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftLexicalLookup", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntax", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "SwiftSyntaxBuilder", package: "swift-syntax",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"])
),
.product(
name: "ArgumentParser", package: "swift-argument-parser",
condition: .when(traits: ["_SwiftJavaToolDependencyGuardTrait"]),
),
"JavaTypes",
"SwiftJavaShared",
"SwiftJavaConfigurationShared",
Expand Down
Loading