From 5655a27167b3ca28ad2fd3cf250f74cd6810b877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20M=C3=B6sch?= Date: Sun, 15 Jun 2025 20:37:57 +0200 Subject: [PATCH] Update dependencies and consume them from BCR --- BUILD | 6 +++--- MODULE.bazel | 12 ++++++------ Package.resolved | 8 ++++---- Package.swift | 4 ++-- bazel/SWXMLHash.BUILD | 11 ----------- bazel/SwiftArgumentParser.BUILD | 17 ----------------- 6 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 bazel/SWXMLHash.BUILD delete mode 100644 bazel/SwiftArgumentParser.BUILD diff --git a/BUILD b/BUILD index f171dc33..edf2b6f2 100644 --- a/BUILD +++ b/BUILD @@ -9,8 +9,8 @@ swift_library( module_name = "SourceKittenFramework", srcs = ["//Source:SourceKittenFrameworkSources"], deps = [ - "@sourcekitten_com_github_drmohundro_SWXMLHash//:SWXMLHash", - "@sourcekitten_com_github_jpsim_yams//:Yams", + "@com_github_drmohundro_SWXMLHash//:SWXMLHash", + "@com_github_jpsim_yams//:Yams", "//Source:SourceKit", "//Source:Clang_C" ], @@ -23,7 +23,7 @@ swift_binary( srcs = ["//Source:SourceKittenLibSources"], deps = [ ":SourceKittenFramework", - "@sourcekitten_com_github_apple_swift_argument_parser//:ArgumentParser" + "@com_github_apple_swift_argument_parser//:ArgumentParser" ], defines = ["SWIFT_PACKAGE"], visibility = ["//visibility:public"] diff --git a/MODULE.bazel b/MODULE.bazel index 5b1e3910..31e985e1 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -4,13 +4,13 @@ module( compatibility_level = 1, ) -bazel_dep(name = "platforms", version = "0.0.8", dev_dependency = True) -bazel_dep(name = "apple_support", version = "1.11.1", repo_name = "build_bazel_apple_support") +bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True) +bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support") bazel_dep(name = "rules_swift", version = "2.0.0", max_compatibility_level = 3, repo_name = "build_bazel_rules_swift") -bazel_dep(name = "swift_argument_parser", version = "1.3.1.2", repo_name = "sourcekitten_com_github_apple_swift_argument_parser") -bazel_dep(name = "swxmlhash", version = "7.0.2.2", repo_name = "sourcekitten_com_github_drmohundro_SWXMLHash") -bazel_dep(name = "yams", version = "6.0.1", repo_name = "sourcekitten_com_github_jpsim_yams") -bazel_dep(name = "rules_cc", version = "0.0.2") +bazel_dep(name = "swift_argument_parser", version = "1.3.1.2", repo_name = "com_github_apple_swift_argument_parser") +bazel_dep(name = "swxmlhash", version = "7.0.2.2", repo_name = "com_github_drmohundro_SWXMLHash") +bazel_dep(name = "yams", version = "6.0.1", repo_name = "com_github_jpsim_yams") +bazel_dep(name = "rules_cc", version = "0.0.9") apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension") use_repo(apple_cc_configure, "local_config_apple_cc") diff --git a/Package.resolved b/Package.resolved index 16da0541..2ea9bfcb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "46989693916f56d1186bd59ac15124caef896560", - "version" : "1.3.1" + "revision" : "011f0c765fb46d9cac61bca19be0527e99c98c8b", + "version" : "1.5.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jpsim/Yams.git", "state" : { - "revision" : "9234124cff5e22e178988c18d8b95a8ae8007f76", - "version" : "5.1.2" + "revision" : "7568d1c6c63a094405afb32264c57dc4e1435835", + "version" : "6.0.1" } } ], diff --git a/Package.swift b/Package.swift index c19d079f..4bb30c2e 100644 --- a/Package.swift +++ b/Package.swift @@ -9,9 +9,9 @@ let package = Package( .library(name: "SourceKittenFramework", targets: ["SourceKittenFramework"]) ], dependencies: [ - .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.1"), + .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.1"), .package(url: "https://github.com/drmohundro/SWXMLHash.git", from: "7.0.2"), - .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.5"), + .package(url: "https://github.com/jpsim/Yams.git", from: "6.0.1"), ], targets: [ .executableTarget( diff --git a/bazel/SWXMLHash.BUILD b/bazel/SWXMLHash.BUILD deleted file mode 100644 index 42d6233a..00000000 --- a/bazel/SWXMLHash.BUILD +++ /dev/null @@ -1,11 +0,0 @@ -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) - -swift_library( - name = "SWXMLHash", - srcs = glob(["Source/**/*.swift"]), - module_name = "SWXMLHash", - visibility = ["//visibility:public"], -) diff --git a/bazel/SwiftArgumentParser.BUILD b/bazel/SwiftArgumentParser.BUILD deleted file mode 100644 index 7db3aee8..00000000 --- a/bazel/SwiftArgumentParser.BUILD +++ /dev/null @@ -1,17 +0,0 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") - -swift_library( - name = "ArgumentParserToolInfo", - srcs = glob(["Sources/ArgumentParserToolInfo/**/*.swift"]), - module_name = "ArgumentParserToolInfo", -) - -swift_library( - name = "ArgumentParser", - srcs = glob(["Sources/ArgumentParser/**/*.swift"]), - module_name = "ArgumentParser", - visibility = ["//visibility:public"], - deps = [ - ":ArgumentParserToolInfo", - ], -)