From 58239e6f1bf33817d1f668c242778f0b7567d740 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 1 Apr 2025 08:47:39 -0700 Subject: [PATCH 1/5] Specify SwiftSyntax601 in more places. --- BUILD.bazel | 1 + Package.swift | 3 ++- Sources/VersionMarkerModules/CMakeLists.txt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index 1360cff9043..d664315eb1a 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -219,6 +219,7 @@ swift_syntax_library( ":SwiftSyntax509", ":SwiftSyntax510", ":SwiftSyntax600", + ":SwiftSyntax601", ":_SwiftSyntaxCShims", ], ) diff --git a/Package.swift b/Package.swift index 43df607866b..c8cd2469c07 100644 --- a/Package.swift +++ b/Package.swift @@ -210,7 +210,8 @@ let package = Package( .target( name: "SwiftSyntax", - dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600"], + dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", + "SwiftSyntax601"], exclude: ["CMakeLists.txt"], swiftSettings: swiftSyntaxSwiftSettings ), diff --git a/Sources/VersionMarkerModules/CMakeLists.txt b/Sources/VersionMarkerModules/CMakeLists.txt index 52457d79b36..80b6942029d 100644 --- a/Sources/VersionMarkerModules/CMakeLists.txt +++ b/Sources/VersionMarkerModules/CMakeLists.txt @@ -14,3 +14,5 @@ add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax510 STATIC SwiftSyntax509/Empty.swift) add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax600 STATIC SwiftSyntax509/Empty.swift) +add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax601 STATIC + SwiftSyntax509/Empty.swift) From e778a0bfafce01b510d97ca929737964fcf74a5c Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 1 Apr 2025 08:54:23 -0700 Subject: [PATCH 2/5] Fix formatting. --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index c8cd2469c07..8f9831ada09 100644 --- a/Package.swift +++ b/Package.swift @@ -210,8 +210,7 @@ let package = Package( .target( name: "SwiftSyntax", - dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", - "SwiftSyntax601"], + dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601"], exclude: ["CMakeLists.txt"], swiftSettings: swiftSyntaxSwiftSettings ), From 239989f736ed012d75e6857ee9a2529ad213d07f Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 1 Apr 2025 18:07:57 -0700 Subject: [PATCH 3/5] Add SwiftSyntax602 references in a few places. --- BUILD.bazel | 8 ++++++++ Package.swift | 2 +- Sources/VersionMarkerModules/CMakeLists.txt | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index d664315eb1a..0ac2123ce63 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -220,6 +220,7 @@ swift_syntax_library( ":SwiftSyntax510", ":SwiftSyntax600", ":SwiftSyntax601", + ":SwiftSyntax602", ":_SwiftSyntaxCShims", ], ) @@ -252,6 +253,13 @@ swift_syntax_library( ], ) +swift_syntax_library( + name = "SwiftSyntax602", + srcs = glob(["Sources/VersionMarkerModules/SwiftSyntax602/**/*.swift"]), + deps = [ + ], +) + swift_syntax_library( name = "SwiftSyntaxBuilder", deps = [ diff --git a/Package.swift b/Package.swift index 8f9831ada09..45d1ba5874f 100644 --- a/Package.swift +++ b/Package.swift @@ -210,7 +210,7 @@ let package = Package( .target( name: "SwiftSyntax", - dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601"], + dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601", "SwiftSyntax602"], exclude: ["CMakeLists.txt"], swiftSettings: swiftSyntaxSwiftSettings ), diff --git a/Sources/VersionMarkerModules/CMakeLists.txt b/Sources/VersionMarkerModules/CMakeLists.txt index 80b6942029d..467d4aa2202 100644 --- a/Sources/VersionMarkerModules/CMakeLists.txt +++ b/Sources/VersionMarkerModules/CMakeLists.txt @@ -16,3 +16,5 @@ add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax600 STATIC SwiftSyntax509/Empty.swift) add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax601 STATIC SwiftSyntax509/Empty.swift) +add_library(${SWIFTSYNTAX_TARGET_NAMESPACE}SwiftSyntax602 STATIC + SwiftSyntax509/Empty.swift) \ No newline at end of file From f347e66da51b5fd0ee7c62120729d6cd49c097e7 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 2 Apr 2025 13:35:29 -0700 Subject: [PATCH 4/5] Fix formatting. --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 45d1ba5874f..aa59056c48b 100644 --- a/Package.swift +++ b/Package.swift @@ -210,7 +210,9 @@ let package = Package( .target( name: "SwiftSyntax", - dependencies: ["_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601", "SwiftSyntax602"], + dependencies: [ + "_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601", "SwiftSyntax602" + ], exclude: ["CMakeLists.txt"], swiftSettings: swiftSyntaxSwiftSettings ), From 6b2656b6340559a9ae9a0d675eb6640a19901c39 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 2 Apr 2025 20:32:00 -0700 Subject: [PATCH 5/5] More formatting. --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index aa59056c48b..5c20ee04b86 100644 --- a/Package.swift +++ b/Package.swift @@ -211,7 +211,7 @@ let package = Package( .target( name: "SwiftSyntax", dependencies: [ - "_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601", "SwiftSyntax602" + "_SwiftSyntaxCShims", "SwiftSyntax509", "SwiftSyntax510", "SwiftSyntax600", "SwiftSyntax601", "SwiftSyntax602", ], exclude: ["CMakeLists.txt"], swiftSettings: swiftSyntaxSwiftSettings