소스 검색

ZipBuilder Firebase 7 updates (#6629)

Paul Beusterien 5 년 전
부모
커밋
d74b89bab5
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 3
      ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift
  2. 1 1
      ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift

+ 4 - 3
ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -438,10 +438,11 @@ enum CocoaPodUtils {
     if !versionsSpecified, let localURL = LaunchArgs.shared.localPodspecPath {
       let podspecs = try! FileManager.default.contentsOfDirectory(atPath: localURL.path)
       for podspec in podspecs {
-        if (podspec == "FirebaseInstanceID.podspec" ||
+        if podspec == "FirebaseInstanceID.podspec" ||
           podspec == "FirebaseInstallations.podspec" ||
-          podspec == "FirebaseCoreDiagnostics.podspec") ||
-          podspec.starts(with: "Google"), podspec.hasSuffix(".podspec") {
+          podspec == "FirebaseCoreDiagnostics.podspec" ||
+          podspec == "GoogleUtilities.podspec" ||
+          podspec == "GoogleDataTransport.podspec" {
           let podName = podspec.replacingOccurrences(of: ".podspec", with: "")
           podfile += "  pod '\(podName)', :path => '\(localURL.path)/\(podspec)'\n"
         }

+ 1 - 1
ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift

@@ -341,7 +341,7 @@ struct LaunchArgs {
       minimumIOSVersion = minVersion
     } else {
       // No argument was passed in.
-      minimumIOSVersion = "9.0"
+      minimumIOSVersion = "10.0"
     }
 
     buildDependencies = defaults.bool(forKey: Key.buildDependencies.rawValue)