Skip to content

Commit

Permalink
Fix resources filename mismatch when a dependency has a + (#6151)
Browse files Browse the repository at this point in the history
  • Loading branch information
fortmarek committed Apr 5, 2024
1 parent 396be18 commit c84f3e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public class ResourcesProjectMapper: ProjectMapping { // swiftlint:disable:this
}

private func synthesizedFilePath(target: Target, project: Project, fileExtension: String) -> AbsolutePath {
let filename = "TuistBundle+\(target.name.camelized.uppercasingFirst).\(fileExtension)"
let filename = "TuistBundle+\(target.name.uppercasingFirst).\(fileExtension)"
return project.derivedDirectoryPath(for: target).appending(components: Constants.DerivedDirectory.sources, filename)
}

Expand Down
1 change: 1 addition & 0 deletions fixtures/multiplatform_app_with_sdk/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ let project = Project(
.external(name: "FirebaseAnalytics"),
.external(name: "FirebasePerformance", condition: .when([.ios])),
.external(name: "FirebaseRemoteConfig"),
.external(name: "FirebaseInAppMessaging-Beta"),
.sdk(name: "MobileCoreServices", type: .framework, status: .required, condition: .when([.ios])),
]
),
Expand Down
8 changes: 4 additions & 4 deletions fixtures/multiplatform_app_with_sdk/Tuist/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "fcf5ced6dae2d43fced2581e673cc3b59bdb8ffa",
"version" : "10.23.0"
"revision" : "888f0b6026e2441a69e3ee2ad5293c7a92031e62",
"version" : "10.23.1"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "6ec4ca62b00a665fa09b594fab897753a8c635fa",
"version" : "10.23.0"
"revision" : "c7a5917ebe48d69f421aadf154ef3969c8b7f12d",
"version" : "10.23.1"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion fixtures/multiplatform_app_with_sdk/Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import PackageDescription
let package = Package(
name: "PackageName",
dependencies: [
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.23.0"),
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.23.1"),
]
)

0 comments on commit c84f3e0

Please sign in to comment.