From cf63126f56eb967ab6553222d82c4faa6da042dd Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 19 Aug 2025 17:26:59 -0400 Subject: [PATCH] fix(tooling): Use module name over spec name in XCFramework module maps --- ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift | 2 +- ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift index cd87fd3272e..c29eaeb3305 100755 --- a/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift +++ b/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift @@ -272,7 +272,7 @@ struct FrameworkBuilder { /// /// - Parameter framework: The name of the pod to be built. /// - Returns: The corresponding framework/module name. - private static func frameworkBuildName(_ framework: String) -> String { + static func frameworkBuildName(_ framework: String) -> String { switch framework { case "abseil": return "absl" diff --git a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift index dc781d6a0d4..a1ccd32243e 100755 --- a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift +++ b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift @@ -248,6 +248,11 @@ struct ModuleMapBuilder { installedPods[name]?.transitiveFrameworks = transitiveFrameworkDeps installedPods[name]?.transitiveLibraries = transitiveLibraryDeps - return ModuleMapContents(module: name, frameworks: myFrameworkDeps, libraries: myLibraryDeps) + let moduleName = FrameworkBuilder.frameworkBuildName(name) + return ModuleMapContents( + module: moduleName, + frameworks: myFrameworkDeps, + libraries: myLibraryDeps + ) } }