Fix runtime error when using objc dependencies (#5929)

tuist · Feb 14, 2024 · 9297022 · 9297022
1 parent 0e50f94
commit 9297022
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift b/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift
@@ -49,6 +49,7 @@ enum ModuleMapMapperError: FatalError {
 public final class ModuleMapMapper: WorkspaceMapping {
     private static let modulemapFileSetting = "MODULEMAP_FILE"
     private static let otherCFlagsSetting = "OTHER_CFLAGS"
+    private static let otherLinkerFlagsSetting = "OTHER_LDFLAGS"
     private static let otherSwiftFlagsSetting = "OTHER_SWIFT_FLAGS"
     private static let headerSearchPaths = "HEADER_SEARCH_PATHS"
 
@@ -119,6 +120,14 @@ public final class ModuleMapMapper: WorkspaceMapping {
                     mappedSettingsDictionary[Self.headerSearchPaths] = updatedHeaderSearchPaths
                 }
 
+                if let updatedOtherLinkerFlags = Self.updatedOtherLinkerFlags(
+                    targetID: targetID,
+                    oldOtherLinkerFlags: mappedSettingsDictionary[Self.otherLinkerFlagsSetting],
+                    targetToModuleMaps: targetToModuleMaps
+                ) {
+                    mappedSettingsDictionary[Self.otherLinkerFlagsSetting] = updatedOtherLinkerFlags
+                }
+
                 let targetSettings = mappedTarget.settings ?? Settings(
                     base: [:],
                     configurations: [:],
@@ -296,4 +305,26 @@ public final class ModuleMapMapper: WorkspaceMapping {
 
         return .array(mappedOtherCFlags)
     }
+
+    private static func updatedOtherLinkerFlags(
+        targetID: TargetID,
+        oldOtherLinkerFlags: SettingsDictionary.Value?,
+        targetToModuleMaps: [TargetID: Set<AbsolutePath>]
+    ) -> SettingsDictionary.Value? {
+        guard let dependenciesModuleMaps = targetToModuleMaps[targetID], !dependenciesModuleMaps.isEmpty else { return nil }
+
+        var mappedOtherLinkerFlags: [String]
+        switch oldOtherLinkerFlags ?? .array(["$(inherited)"]) {
+        case let .array(values):
+            mappedOtherLinkerFlags = values
+        case let .string(value):
+            mappedOtherLinkerFlags = value.split(separator: " ").map(String.init)
+        }
+
+        if !mappedOtherLinkerFlags.contains("-ObjC") {
+            mappedOtherLinkerFlags.append("-ObjC")
+        }
+
+        return .array(mappedOtherLinkerFlags)
+    }
 }
diff --git a/Tests/TuistGeneratorTests/ProjectMappers/ModuleMapMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/ModuleMapMapperTests.swift
@@ -95,6 +95,7 @@ final class ModuleMapMapperTests: TuistUnitTestCase {
                     "-fmodule-map-file=$(SRCROOT)/../B/B2/B2.module",
                 ]),
                 "HEADER_SEARCH_PATHS": .array(["$(inherited)", "$(SRCROOT)/../B/B1", "$(SRCROOT)/../B/B2"]),
+                "OTHER_LDFLAGS": .array(["$(inherited)", "-ObjC"]),
             ]),
             dependencies: [
                 .project(target: "B1", path: projectBPath),
@@ -114,6 +115,7 @@ final class ModuleMapMapperTests: TuistUnitTestCase {
                 "OTHER_CFLAGS": .array(["$(inherited)", "-fmodule-map-file=$(SRCROOT)/B2/B2.module"]),
                 "OTHER_SWIFT_FLAGS": .array(["$(inherited)", "-Xcc", "-fmodule-map-file=$(SRCROOT)/B2/B2.module"]),
                 "HEADER_SEARCH_PATHS": .array(["$(inherited)", "$(SRCROOT)/B2"]),
+                "OTHER_LDFLAGS": .array(["$(inherited)", "-ObjC"]),
             ]),
             dependencies: [
                 .target(name: "B2"),
@@ -205,6 +207,7 @@ final class ModuleMapMapperTests: TuistUnitTestCase {
                         "-fmodule-map-file=$(SRCROOT)/../B/B/B.module",
                     ]),
                     "HEADER_SEARCH_PATHS": .array(["$(inherited)", "$(SRCROOT)/../B/B"]),
+                    "OTHER_LDFLAGS": .array(["$(inherited)", "-ObjC"]),
                 ],
                 configurations: [:],
                 defaultSettings: .recommended

diff --git a/fixtures/app_with_spm_dependencies/App/Sources/AppKit/AppKit.swift b/fixtures/app_with_spm_dependencies/App/Sources/AppKit/AppKit.swift
@@ -23,7 +23,7 @@ public enum AppKit {
         _ = YAMLEncoder()
 
         // Use GoogleSignIn
-        _ = GIDSignIn.sharedInstance.configuration
+        _ = GIDSignIn.sharedInstance.hasPreviousSignIn()
 
         // Use Sentry
         SentrySDK.startSession()