Changes to build m45 zip (#2561)

Author: paulb777

ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -146,7 +146,7 @@ public enum CocoaPodUtils {
     }
 
     // Run pod install on the directory that contains the Podfile and blank Xcode project.
-    let result = Shell.executeCommandFromScript("pod install", workingDir: directory)
+    let result = Shell.executeCommandFromScript("pod _1.5.3_ install", workingDir: directory)
     switch result {
     case let .error(code, output):
       fatalError("""

ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift

@@ -83,24 +83,26 @@ struct FrameworkBuilder {
                              cacheEnabled: Bool = false) -> (framework: URL, resources: URL) {
     print("Building \(podName)")
 
+//  Cache is temporarily disabled due to pod cache list issues.
     // Get the CocoaPods cache to see if we can pull from any frameworks already built.
-    let podsCache = CocoaPodUtils.listPodCache(inDir: projectDir)
-
-    guard let cachedVersions = podsCache[podName] else {
-      fatalError("Cannot find a pod cache for framework \(podName).")
-    }
-
-    guard let podInfo = cachedVersions[version] else {
-      fatalError("""
-      Cannot find a pod cache for framework \(podName) at version \(version).
-      Something could be wrong with your CocoaPods cache - try running the following:
-
-      pod cache clean '\(podName)' --all
-      """)
-    }
-
-    // TODO: Figure out if we need the MD5 at all.
-    let md5 = Shell.calculateMD5(for: podInfo.installedLocation)
+//    let podsCache = CocoaPodUtils.listPodCache(inDir: projectDir)
+//
+//    guard let cachedVersions = podsCache[podName] else {
+//      fatalError("Cannot find a pod cache for framework \(podName).")
+//    }
+//
+//    guard let podInfo = cachedVersions[version] else {
+//      fatalError("""
+//      Cannot find a pod cache for framework \(podName) at version \(version).
+//      Something could be wrong with your CocoaPods cache - try running the following:
+//
+//      pod cache clean '\(podName)' --all
+//      """)
+//    }
+//
+//    // TODO: Figure out if we need the MD5 at all.
+      let md5 = podName
+//    let md5 = Shell.calculateMD5(for: podInfo.installedLocation)
 
     // Get (or create) the cache directory for storing built frameworks.
     let fileManager = FileManager.default

ZipBuilder/Sources/ZipBuilder/Subspec.swift

@@ -36,6 +36,7 @@ public enum Subspec: String, CaseIterable {
   case mlModelInterpreter = "MLModelInterpreter"
   case mlNaturalLanguage = "MLNaturalLanguage"
   case mlNLLanguageID = "MLNLLanguageID"
+  case mlNLSmartReply = "MLNLSmartReply"
   case mlVision = "MLVision"
   case mlVisionBarcodeModel = "MLVisionBarcodeModel"
   case mlVisionFaceModel = "MLVisionFaceModel"