Zip Builder support for dependencies through subspecs (#4940)

Author: paulb777

ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -57,13 +57,17 @@ enum CocoaPodUtils {
  /// Binary frameworks in this pod.
 letbinaryFrameworks:[URL]
 
+ /// Subspecs installed for this pod.
+letsubspecs:Set<String>
+
  /// The contents of the module map for all frameworks associated with the pod.
 varmoduleMapContents:String
 
-init(version:String, dependencies:[String], installedLocation:URL){
+init(version:String, dependencies:[String], installedLocation:URL, subspecs:Set<String>){
 self.version = version
 self.dependencies = dependencies
 self.installedLocation = installedLocation
+self.subspecs = subspecs
  moduleMapContents =""
 
  // Get all the frameworks contained in this directory.
@@ -186,30 +190,48 @@ enum CocoaPodUtils {
 break
 }
 iflet(pod, version)=detectVersion(fromLine: line){
-letcorePod= pod.components(separatedBy:"/")[0]
- currentPod = corePod.trimmingCharacters(in: quotes)
+ currentPod = pod.trimmingCharacters(in: quotes)
 pods[currentPod!]= version
 }elseiflet currentPod = currentPod {
 letmatches= depRegex.matches(in: line, range:NSRange(location:0, length: line.utf8.count))
  // Match something like - GTMSessionFetcher/Full (= 1.3.0)
 iflet match = matches.first {
 letdepLine=(line asNSString).substring(with: match.range(at:0))asString
  // Split spaces and subspecs.
-letdep= depLine.components(separatedBy:["","/"])[2].trimmingCharacters(in: quotes)
+letdep= depLine.components(separatedBy:[""])[2].trimmingCharacters(in: quotes)
 if dep != currentPod {
-ifdeps[currentPod]==nil{
-deps[currentPod]=Set()
-}
-deps[currentPod]?.insert(dep)
+deps[currentPod, default:Set()].insert(dep)
 }
 }
 }
 }
+ // Organize the subspecs
+varversions:[String:String]=[:]
+varsubspecs:[String:Set<String>]=[:]
+
+for(podName, version)in pods {
+letsubspecArray= podName.components(separatedBy:"/")
+if subspecArray.count >2{
+fatalError("Multi-layered subspecs are not supported - \(podName)")
+}elseif subspecArray.count ==1{
+versions[podName]= version
+}else{
+iflet previousVersion =versions[podName], version != previousVersion {
+fatalError("Different installed versions for \(podName)."+
+"\(version) versus \(previousVersion)")
+}else{
+letbasePodName=subspecArray[0]
+versions[basePodName]= version
+subspecs[basePodName, default:Set()].insert(subspecArray[1])
+deps[basePodName]=deps[basePodName, default:Set()].union(deps[podName]??Set())
+}
+}
+}
 
  // Generate an InstalledPod for each Pod found.
 letpodsDir= projectDir.appendingPathComponent("Pods")
 varinstalledPods:[String:PodInfo]=[:]
-for(podName, version)inpods{
+for(podName, version)inversions{
 varpodDir= podsDir.appendingPathComponent(podName)
  // Make sure that pod got installed if it's not coming from a local podspec.
 if !FileManager.default.directoryExists(at: podDir){
@@ -220,7 +242,8 @@ enum CocoaPodUtils {
  podDir = repoDir
 }
 letdependencies=[String](deps[podName]??[])
-letpodInfo=PodInfo(version: version, dependencies: dependencies, installedLocation: podDir)
+letpodInfo=PodInfo(version: version, dependencies: dependencies, installedLocation: podDir,
+ subspecs:subspecs[podName]??Set())
 installedPods[podName]= podInfo
 }
 return installedPods

ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift

@@ -408,7 +408,9 @@ struct FrameworkBuilder {
 }
  // Verify Firebase frameworks include an explicit umbrella header for Firebase.h.
 letheadersDir= podsDir.appendingPathComponents(["Headers","Public", framework])
-if framework.hasPrefix("Firebase"), framework !="FirebaseCoreDiagnostics"{
+if framework.hasPrefix("Firebase"),
+ framework !="FirebaseCoreDiagnostics",
+ framework !="FirebaseUI"{
 letframeworkHeader= headersDir.appendingPathComponent("\(framework).h")
 guard fileManager.fileExists(atPath: frameworkHeader.path)else{
 fatalError("Missing explicit umbrella header for \(framework).")

ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift

@@ -23,12 +23,14 @@ struct ModuleMapBuilder {
 privateclassFrameworkInfo{
 letisSourcePod:Bool
 letversionedPod:CocoaPodUtils.VersionedPod
+letsubspecs:Set<String>
 vartransitiveFrameworks:Set<String>?
 vartransitiveLibraries:Set<String>?
 
-init(isSourcePod:Bool, versionedPod:CocoaPodUtils.VersionedPod){
+init(isSourcePod:Bool, versionedPod:CocoaPodUtils.VersionedPod, subspecs:Set<String>){
 self.isSourcePod = isSourcePod
 self.versionedPod = versionedPod
+self.subspecs = subspecs
 }
 }
 
@@ -55,11 +57,8 @@ struct ModuleMapBuilder {
 
 varinstalledPods:[String:FrameworkInfo]=[:]
 forpodin selectedPods {
-letframeworkName= pod.key
-letisSourcePod= pod.value.isSourcePod
-letversion= pod.value.version
-letversionedPod=CocoaPodUtils.VersionedPod(name: frameworkName, version: version)
-installedPods[frameworkName]=FrameworkInfo(isSourcePod: isSourcePod, versionedPod: versionedPod)
+letversionedPod=CocoaPodUtils.VersionedPod(name: pod.key, version: pod.value.version)
+installedPods[pod.key]=FrameworkInfo(isSourcePod: pod.value.isSourcePod, versionedPod: versionedPod, subspecs: pod.value.subspecs)
 }
 self.installedPods = installedPods
 }
@@ -85,7 +84,7 @@ struct ModuleMapBuilder {
 privatefunc generate(framework:FrameworkInfo){
 letpodName= framework.versionedPod.name
 letdeps=CocoaPodUtils.transitiveVersionedPodDependencies(for: podName, in: allPods)
- _ =CocoaPodUtils.installPods([framework.versionedPod]+ deps,
+ _ =CocoaPodUtils.installPods(allSubspecList(framework: framework)+ deps,
  inDir: projectDir,
  customSpecRepos: customSpecRepos)
 letxcconfigFile= projectDir.appendingPathComponents(["Pods","Target Support Files",
@@ -94,6 +93,21 @@ struct ModuleMapBuilder {
 allPods[podName]?.moduleMapContents =makeModuleMap(forFramework: framework, withXcconfigFile: xcconfigFile)
 }
 
+ /// Convert a list of versioned pods to a list of versioned pods specified with all needed subspecs.
+privatefunc allSubspecList(framework:FrameworkInfo)->[CocoaPodUtils.VersionedPod]{
+letname= framework.versionedPod.name
+letversion= framework.versionedPod.version
+letsubspecs= framework.subspecs
+if subspecs.count ==0{
+return[CocoaPodUtils.VersionedPod(name:"\(name)", version: version)]
+}
+varlist:[CocoaPodUtils.VersionedPod]=[]
+forsubspecin framework.subspecs {
+ list.append(CocoaPodUtils.VersionedPod(name:"\(name)/\(subspec)", version: version))
+}
+return list
+}
+
  // Extract the framework and library dependencies for a framework from
  // the xcconfig file from an app generated from a Podfile only with that
  // CocoaPod and removing the frameworks and libraries from its transitive dependencies.