diff --git a/README.md b/README.md index 6ce61fc25..3e99e5c76 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Add a dependency on `rules_swift_package_manager`. ```python -bazel_dep(name = "rules_swift_package_manager", version = "0.36.0") +bazel_dep(name = "rules_swift_package_manager", version = "0.37.0") ``` diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel index cc43e3f86..22367ee6e 100644 --- a/bzlmod/workspace/MODULE.bazel +++ b/bzlmod/workspace/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 86d48db4e..e90c9eeb0 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -36,7 +36,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index f9cb627ce..79a31ad9a 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 114d6c26d..9212f8bed 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -44,7 +44,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 114d6c26d..9212f8bed 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -44,7 +44,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index b952be353..dcc260a61 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index fdcc88d71..16a1f624f 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 270452f3b..975734fea 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 75e93d273..f5737a980 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index e1f757a2d..1aacb9c41 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/nimble_example/Package.swift b/examples/nimble_example/Package.swift index 1bd53fb00..87fe64995 100644 --- a/examples/nimble_example/Package.swift +++ b/examples/nimble_example/Package.swift @@ -11,7 +11,7 @@ let package = Package( ), .package( url: "https://github.com/Quick/Nimble", - from: "13.3.0" + from: "13.4.0" ), ], targets: [ diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index a3c573324..2dda84466 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 3010c145c..7cf89630b 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/phone_number_kit/Package.swift b/examples/phone_number_kit/Package.swift index 68bbdc3b9..067a0e019 100644 --- a/examples/phone_number_kit/Package.swift +++ b/examples/phone_number_kit/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "PhoneNumberKitExample", dependencies: [ - .package(url: "https://github.com/marmelroy/PhoneNumberKit", from: "3.7.11"), + .package(url: "https://github.com/marmelroy/PhoneNumberKit", from: "3.8.0"), ] ) diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index 90cb5a970..15a105f5f 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index dda30672c..84cfbf7f5 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index ba1a2361d..91513ecc1 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/shake_ios_example/Package.swift b/examples/shake_ios_example/Package.swift index 794204674..61bcd0070 100644 --- a/examples/shake_ios_example/Package.swift +++ b/examples/shake_ios_example/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "shake_ios_example", dependencies: [ - .package(url: "https://github.com/shakebugs/shake-ios", from: "17.0.0"), + .package(url: "https://github.com/shakebugs/shake-ios", from: "17.0.1"), ] ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 4dd902962..02ff65a4f 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 4ee47a054..7a91ce618 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index b1103e724..aef6a577a 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index bc4014bef..e2e5f0029 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index ecd4449c4..d5e0dd723 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index d599f76de..ac7e1196b 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index 3281977f8..0af83febb 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/swiftpkg/internal/swiftpkg_build_files.bzl b/swiftpkg/internal/swiftpkg_build_files.bzl index c4c06de7a..3fc6688bd 100644 --- a/swiftpkg/internal/swiftpkg_build_files.bzl +++ b/swiftpkg/internal/swiftpkg_build_files.bzl @@ -61,7 +61,7 @@ def _swift_target_build_file(pkg_ctx, target): # Gate package_name behind swift tools version 5.9 if tools_version_major >= 6 or (tools_version_major == 5 and tools_version_minor >= 9): - attrs["package_name"] = target.label.repository_name.lstrip("@") + ".rspm" + attrs["package_name"] = pkg_ctx.pkg_info.name target_deps = [] macro_targets = [] diff --git a/swiftpkg/tests/swiftpkg_build_files_tests.bzl b/swiftpkg/tests/swiftpkg_build_files_tests.bzl index c10ea73d4..afbd1bd16 100644 --- a/swiftpkg/tests/swiftpkg_build_files_tests.bzl +++ b/swiftpkg/tests/swiftpkg_build_files_tests.bzl @@ -494,7 +494,7 @@ swift_library( always_include_developer_search_paths = True, copts = ["-DSWIFT_PACKAGE"], module_name = "RegularSwiftTargetAsLibrary", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Source/RegularSwiftTargetAsLibrary/RegularSwiftTargetAsLibrary.swift"], tags = ["manual"], visibility = ["//:__subpackages__"], @@ -516,7 +516,7 @@ swift_library( copts = ["-DSWIFT_PACKAGE"], deps = ["@swiftpkg_mypackage//:RegularSwiftTargetAsLibrary.rspm"], module_name = "RegularTargetForExec", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Source/RegularTargetForExec/main.swift"], tags = ["manual"], visibility = ["//:__subpackages__"], @@ -534,7 +534,7 @@ swift_test( copts = ["-DSWIFT_PACKAGE"], deps = ["@swiftpkg_mypackage//:RegularSwiftTargetAsLibrary.rspm"], module_name = "RegularSwiftTargetAsLibraryTests", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Tests/RegularSwiftTargetAsLibraryTests/RegularSwiftTargetAsLibraryTests.swift"], visibility = ["//:__subpackages__"], ) @@ -561,7 +561,7 @@ swift_binary( "//conditions:default": [], }), module_name = "SwiftExecutableTarget", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Source/SwiftExecutableTarget/main.swift"], visibility = ["//:__subpackages__"], ) @@ -737,7 +737,7 @@ swift_library( "//conditions:default": [], }), module_name = "SwiftLibraryWithConditionalDep", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Source/SwiftLibraryWithConditionalDep/SwiftLibraryWithConditionalDep.swift"], tags = ["manual"], visibility = ["//:__subpackages__"], @@ -807,7 +807,7 @@ swift_library( ], generates_header = True, module_name = "SwiftForObjcTarget", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = ["Source/SwiftForObjcTarget/SwiftForObjcTarget.swift"], tags = ["manual"], visibility = ["//:__subpackages__"], @@ -846,7 +846,7 @@ swift_library( copts = ["-DSWIFT_PACKAGE"], data = [":SwiftLibraryWithFilePathResource.rspm_resource_bundle"], module_name = "SwiftLibraryWithFilePathResource", - package_name = "swiftpkg_mypackage.rspm", + package_name = "MyPackage", srcs = [ "Source/SwiftLibraryWithFilePathResource/SwiftLibraryWithFilePathResource.swift", ":SwiftLibraryWithFilePathResource.rspm_resource_bundle_accessor", diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 92fbbc74b..d711996d1 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.38.0", dev_dependency = True, repo_name = "bazel_gazelle", )