fix: use package name for package_name resolution (#1215)

Author: jpsim

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 = []

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",