Fix objc_defines (#121)

Sources/BazelPodsCore/Analyzer/Analyzers/BuildSettingsAnalyzer.swift

@@ -12,6 +12,7 @@ struct BuildSettingsAnalyzer<S: XCConfigRepresentable> {
         let swiftCopts: [String]
         let objcCopts: [String]
         let linkOpts: [String]
+        let objcDefines: [String]
         let xcconfig: [String: StarlarkNode]
     }
     private let platform: Platform
@@ -46,6 +47,7 @@ struct BuildSettingsAnalyzer<S: XCConfigRepresentable> {
             swiftCopts: parser.swiftCopts,
             objcCopts: parser.objcCopts,
             linkOpts: parser.linkOpts,
+            objcDefines: parser.objcDefines,
             xcconfig: parser.xcconfig
         )
     }

Sources/BazelPodsCore/RuleUtils.swift

@@ -20,7 +20,7 @@ public func replacePodsEnvVars(_ value: String, options: BuildOptions, absoluteP
 }
 
 public func xcconfigSettingToList(_ value: String) -> [String] {
-    return value
+    let result = value
         .components(separatedBy: "=\"")
         .map {
             let components = $0.components(separatedBy: "\"")
@@ -36,8 +36,15 @@ public func xcconfigSettingToList(_ value: String) -> [String] {
         .joined(separator: "=\\\"")
         .components(separatedBy: .whitespaces)
         .map { $0.removingPercentEncoding ?? "" }
-        .map { $0.replacingOccurrences(of: "\"", with: "") }
+        .map {
+            if $0.contains(" ") {
+                return $0.replacingOccurrences(of: "\"", with: "'")
+            } else {
+                return $0.replacingOccurrences(of: "\"", with: "")
+            }
+        }
         .map { $0.replacingOccurrences(of: "\\", with: "") }
         .filter({ $0 != "$(inherited)"})
         .filter({ !$0.isEmpty })
+    return result
 }

Sources/BazelPodsCore/Targets/AppleFramework.swift

@@ -56,7 +56,7 @@ struct AppleFramework: BazelTarget {
         self.conditionalDeps = conditionalDeps
 
         self.swiftDefines = AttrSet(basic: ["COCOAPODS"])
-        self.objcDefines = AttrSet(basic: ["COCOAPODS=1"])
+        self.objcDefines = AttrSet(basic: ["COCOAPODS=1"] + buildSettings.objcDefines)
 
         sdkDylibs = sdkDeps.sdkDylibs
         sdkFrameworks = sdkDeps.sdkFrameworks

Sources/BazelPodsCore/Targets/AppleFrameworkImport.swift

@@ -11,11 +11,7 @@ import Foundation
 struct AppleFrameworkImport: BazelTarget {
     var loadNode: String {
         let rule = appleFrameworkImport(isDynamic: isDynamic, isXCFramework: isXCFramework)
-        if isXCFramework {
-            return "load('@build_bazel_rules_apple//apple:apple.bzl', '\(rule)')"
-        } else {
-            return "load('@build_bazel_rules_ios//rules:apple_patched.bzl', '\(rule)')"
-        }
+        return "load('@build_bazel_rules_apple//apple:apple.bzl', '\(rule)')"
     }
     let name: String // A unique name for this rule.
     // The list of files under a .framework directory which are provided to Objective-C targets that depend on this target.

Sources/BazelPodsCore/XCConfig/XCConfigParser.swift

@@ -12,13 +12,15 @@ final class XCConfigParser {
     private(set) var swiftCopts: [String] = []
     private(set) var objcCopts: [String] = []
     private(set) var linkOpts: [String] = []
+    private(set) var objcDefines: [String] = []
     private let transformers: [String: XCConfigSettingTransformer]
     private static let defaultTransformers: [XCConfigSettingTransformer] = [
         HeaderSearchPathTransformer(),
         ApplicationExtensionAPIOnlyTransformer(),
         LinkOptsListTransformer("OTHER_LDFLAGS"),
         ObjCOptsListTransformer("OTHER_CFLAGS"),
-        ObjCOptsListTransformer("OTHER_CPLUSPLUSFLAGS")
+        ObjCOptsListTransformer("OTHER_CPLUSPLUSFLAGS"),
+        ObjcDefinesListTransformer("GCC_PREPROCESSOR_DEFINITIONS")
     ]
 
     convenience init(spec: PodSpec, subspecs: [PodSpec] = [], options: BuildOptions) {
@@ -40,7 +42,7 @@ final class XCConfigParser {
             return result
         })
 
-        for key in config.keys {
+        for key in config.keys.sorted() {
             guard !XCSpecs.forceIgnore.contains(key) else { continue }
             let node: StarlarkNode?
             let value = replacePodsEnvVars(config[key]!, options: options, absolutePath: false)
@@ -56,13 +58,19 @@ final class XCConfigParser {
             case .none:
                 node = nil
             }
+            var handled = false
             if let node = node {
                 xcconfig[key] = node
-            } else if let transformer = self.transformers[key] {
+                handled = true
+            }
+            if let transformer = self.transformers[key] {
                 swiftCopts += (transformer as? SwiftCoptsProvider)?.swiftCopts(value) ?? []
                 objcCopts += (transformer as? ObjcCoptsProvider)?.objcCopts(value) ?? []
                 linkOpts += (transformer as? LinkOptsProvider)?.linkOpts(value) ?? []
-            } else {
+                objcDefines += (transformer as? ObjcDefinesProvider)?.objcDefines(value) ?? []
+                handled = true
+            }
+            if !handled {
                 log_debug("unhandled xcconfig \(key)")
             }
         }

Sources/BazelPodsCore/XCConfig/XCConfigSettingTransformer.swift

@@ -23,6 +23,10 @@ protocol LinkOptsProvider {
     func linkOpts(_ value: String) -> [String]
 }
 
+protocol ObjcDefinesProvider {
+    func objcDefines(_ value: String) -> [String]
+}
+
 struct HeaderSearchPathTransformer: XCConfigSettingTransformer,
                                     SwiftCoptsProvider,
                                     ObjcCoptsProvider {
@@ -92,3 +96,15 @@ struct SwiftOptsListTransformer: XCConfigSettingTransformer,
         return xcconfigSettingToList(value)
     }
 }
+
+struct ObjcDefinesListTransformer: XCConfigSettingTransformer,
+                                   ObjcDefinesProvider {
+    let key: String
+    init(_ key: String) {
+        self.key = key
+    }
+
+    func objcDefines(_ value: String) -> [String] {
+        return xcconfigSettingToList(value)
+    }
+}

Sources/BazelPodsCore/XCConfig/XCSpecs.swift

@@ -28,7 +28,7 @@ struct XCSpecs {
     }()
 
     // TODO: Investigate
-    static let forceIgnore = [
+    static let forceIgnore: [String] = [
         "GCC_C_LANGUAGE_STANDARD"
     ]
 

TestTools/Pods_Integration.json

@@ -7,7 +7,7 @@
             "version": "5.0.0"
         },
         "Alamofire": {
-            "version": "5.6.2"
+            "version": "5.9.0"
         },
         "Appboy-iOS-SDK": {
             "version": "4.5.0"
@@ -34,10 +34,10 @@
             "version": "11.2.1"
         },
         "Firebase": {
-            "version": "9.5.0"
+            "version": "10.20.0"
         },
         "FirebaseAnalytics": {
-            "version": "9.5.0"
+            "version": "10.20.0"
         },
         "GoogleMaps": {
             "version": "7.3.0"
@@ -52,7 +52,7 @@
             "version": "6.5.10"
         },
         "JTAppleCalendar": {
-            "version": "8.0.4"
+            "version": "8.0.5"
         },
         "KeychainAccess": {
             "version": "4.2.2"
@@ -153,7 +153,7 @@
             "version": "5.0.0"
         },
         "Alamofire": {
-            "version": "5.6.2"
+            "version": "5.9.0"
         },
         "Cartography": {
             "version": "4.0.0"
@@ -168,10 +168,10 @@
             "version": "1.5.1"
         },
         "Firebase": {
-            "version": "9.5.0"
+            "version": "10.20.0"
         },
         "FirebaseAnalytics": {
-            "version": "9.5.0"
+            "version": "10.20.0"
         },
         "KeychainAccess": {
             "version": "4.2.2"