Merge pull request #4 from sergeykhliustin/develop

Hotfix for flaky generated nodes
sergeykhliustin · Sep 22, 2022 · 8eb4c09 · 8eb4c09
2 parents f2047f4 + ee222a0
commit 8eb4c09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/PodToBUILD/BuildFile.swift b/Sources/PodToBUILD/BuildFile.swift
@@ -41,8 +41,9 @@ public struct PodBuildFile: StarlarkConvertible {
  .compactMap({ $0 as? BazelTarget })
  .map({ $0.loadNode })
  .filter({ !$0.isEmpty })
- )
- .map({ StarlarkNode.starlark($0) })
+ )
+ .sorted(by: <)
+ .map({ StarlarkNode.starlark($0) })
  )
  }
 
@@ -89,6 +90,7 @@ public struct PodBuildFile: StarlarkConvertible {
 
  let extraDeps: [BazelTarget] = makeResourceBundles(spec: podSpec, subspecs: subspecs, options: buildOptions)
  let frameworks = AppleFrameworkImport.vendoredFrameworks(withPodspec: podSpec, subspecs: subspecs, options: buildOptions)
+ .sorted(by: { $0.name < $1.name })
  let conditionalDeps = frameworks.reduce([String: [Arch]]()) { partialResult, target in
  guard let target = target as? AppleFrameworkImport else { return partialResult }
  var result = partialResult

diff --git a/Sources/PodToBUILD/Targets/AppleFramework.swift b/Sources/PodToBUILD/Targets/AppleFramework.swift
@@ -182,7 +182,7 @@ struct AppleFramework: BazelTarget {
  result[conditon] = arr
  })
  return result
- }
+ }.mapValues({ $0.sorted(by: <) })
 
  let deps: StarlarkNode
  if conditionalDepsMap.isEmpty {