Zip Builder - update protos (#4454)

Author: paulb777

ZipBuilder/Sources/ManifestReader/FirebaseSDKs.pb.swift

@@ -19,7 +19,7 @@
 // Generated by the Swift generator plugin for the protocol buffer compiler.
 // Source: FirebaseSDKs.proto
 //
-// For information on using the generated types, please see the documenation:
+// For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/
 
 import Foundation
@@ -35,7 +35,6 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-/// A list of all Firebase SDKs.
 public struct ZipBuilder_FirebaseSDKs {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -48,96 +47,113 @@ public struct ZipBuilder_FirebaseSDKs {
   public init() {}
 }
 
-/// Represents a single SDK that should be released.
 public struct ZipBuilder_SDK {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  /// SDK name
+  /// SDK name.
   public var name: String {
     get {return _storage._name}
     set {_uniqueStorage()._name = newValue}
   }
 
-  /// MPM name for the blueprint. For internal use only.
-  public var mpmName: String {
+  /// MPM name for the blueprint.
+  var mpmName: String {
     get {return _storage._mpmName}
     set {_uniqueStorage()._mpmName = newValue}
   }
 
-  /// Public version
+  /// Public version.
   public var publicVersion: String {
     get {return _storage._publicVersion}
     set {_uniqueStorage()._publicVersion = newValue}
   }
 
-  /// List of MPM patterns to build
-  public var mpmPattern: [String] {
+  /// List of MPM patterns to build.
+  var mpmPattern: [String] {
     get {return _storage._mpmPattern}
     set {_uniqueStorage()._mpmPattern = newValue}
   }
 
-  /// An optional list of additional build flags. For internal use only.
-  public var buildFlags: ZipBuilder_BuildFlag {
-    get {return _storage._buildFlags ?? ZipBuilder_BuildFlag()}
-    set {_uniqueStorage()._buildFlags = newValue}
+  /// An optional list of additional blaze flags.
+  var blazeFlags: ZipBuilder_BlazeFlag {
+    get {return _storage._blazeFlags ?? ZipBuilder_BlazeFlag()}
+    set {_uniqueStorage()._blazeFlags = newValue}
   }
-  /// Returns true if `buildFlags` has been explicitly set.
-  public var hasBuildFlags: Bool {return _storage._buildFlags != nil}
-  /// Clears the value of `buildFlags`. Subsequent reads from it will return its default value.
-  public mutating func clearBuildFlags() {_uniqueStorage()._buildFlags = nil}
+  /// Returns true if `blazeFlags` has been explicitly set.
+  var hasBlazeFlags: Bool {return _storage._blazeFlags != nil}
+  /// Clears the value of `blazeFlags`. Subsequent reads from it will return its default value.
+  mutating func clearBlazeFlags() {_uniqueStorage()._blazeFlags = nil}
 
-  /// List of MPM patterns to build (optional nightly override). For internal use only.
-  public var nightlyMpmPattern: [String] {
+  /// List of MPM patterns to build (optional nightly override).
+  var nightlyMpmPattern: [String] {
     get {return _storage._nightlyMpmPattern}
     set {_uniqueStorage()._nightlyMpmPattern = newValue}
   }
 
-  /// Whether or not the SDK is built from open-source. For internal use only.
-  public var openSource: Bool {
+  /// Whether or not the SDK is built from open-source.
+  var openSource: Bool {
     get {return _storage._openSource}
     set {_uniqueStorage()._openSource = newValue}
   }
 
   /// Whether or not to strip the i386 architecture from the build.
-  public var stripI386: Bool {
+  var stripI386: Bool {
     get {return _storage._stripI386}
     set {_uniqueStorage()._stripI386 = newValue}
   }
 
-  /// List of build targets. For internal use only.
-  public var buildTarget: [String] {
+  /// List of build targets to build the SDK - used for collecting licenses.
+  var buildTarget: [String] {
     get {return _storage._buildTarget}
     set {_uniqueStorage()._buildTarget = newValue}
   }
 
   /// Whether or not to strip both the i386 and armv7 architectures from the
-  /// build. All SDKs that use this flag are built internally so this should be ignored.
-  public var strip32Bits: Bool {
+  /// build.
+  var strip32Bits: Bool {
     get {return _storage._strip32Bits}
     set {_uniqueStorage()._strip32Bits = newValue}
   }
 
+  /// Specifies if the provided pod should be fetched from public repo.
+  /// Mainly use for clash testing.
+  var publicPod: Bool {
+    get {return _storage._publicPod}
+    set {_uniqueStorage()._publicPod = newValue}
+  }
+
+  /// Whether or not to use the builtin flags.
+  var noBuiltinFlags: Bool {
+    get {return _storage._noBuiltinFlags}
+    set {_uniqueStorage()._noBuiltinFlags = newValue}
+  }
+
+  /// Whether or not to build arm64e slice.
+  var buildArm64E: Bool {
+    get {return _storage._buildArm64E}
+    set {_uniqueStorage()._buildArm64E = newValue}
+  }
+
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
 
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-/// Any extra build flags needed to build the SDK. For internal use only.
-public struct ZipBuilder_BuildFlag {
+struct ZipBuilder_BlazeFlag {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  /// An additional build flag needed to build the SDK
-  public var flag: [String] = []
+  /// An additional blaze flag needed to build the SDK
+  var flag: [String] = []
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobuf.UnknownStorage()
 
-  public init() {}
+  init() {}
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
@@ -150,7 +166,7 @@ extension ZipBuilder_FirebaseSDKs: SwiftProtobuf.Message, SwiftProtobuf._Message
     1: .same(proto: "sdk"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating public func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       switch fieldNumber {
       case 1: try decoder.decodeRepeatedMessageField(value: &self.sdk)
@@ -180,25 +196,31 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
     2: .standard(proto: "mpm_name"),
     3: .standard(proto: "public_version"),
     4: .standard(proto: "mpm_pattern"),
-    5: .standard(proto: "build_flags"),
+    5: .standard(proto: "blaze_flags"),
     6: .standard(proto: "nightly_mpm_pattern"),
     7: .standard(proto: "open_source"),
     8: .standard(proto: "strip_i386"),
     9: .standard(proto: "build_target"),
     10: .standard(proto: "strip_32bits"),
+    11: .standard(proto: "public_pod"),
+    12: .standard(proto: "no_builtin_flags"),
+    13: .standard(proto: "build_arm64e"),
   ]
 
   fileprivate class _StorageClass {
     var _name: String = String()
     var _mpmName: String = String()
     var _publicVersion: String = String()
     var _mpmPattern: [String] = []
-    var _buildFlags: ZipBuilder_BuildFlag? = nil
+    var _blazeFlags: ZipBuilder_BlazeFlag? = nil
     var _nightlyMpmPattern: [String] = []
     var _openSource: Bool = false
     var _stripI386: Bool = false
     var _buildTarget: [String] = []
     var _strip32Bits: Bool = false
+    var _publicPod: Bool = false
+    var _noBuiltinFlags: Bool = false
+    var _buildArm64E: Bool = false
 
     static let defaultInstance = _StorageClass()
 
@@ -209,12 +231,15 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
       _mpmName = source._mpmName
       _publicVersion = source._publicVersion
       _mpmPattern = source._mpmPattern
-      _buildFlags = source._buildFlags
+      _blazeFlags = source._blazeFlags
       _nightlyMpmPattern = source._nightlyMpmPattern
       _openSource = source._openSource
       _stripI386 = source._stripI386
       _buildTarget = source._buildTarget
       _strip32Bits = source._strip32Bits
+      _publicPod = source._publicPod
+      _noBuiltinFlags = source._noBuiltinFlags
+      _buildArm64E = source._buildArm64E
     }
   }
 
@@ -225,7 +250,7 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
     return _storage
   }
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating public func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -234,12 +259,15 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
         case 2: try decoder.decodeSingularStringField(value: &_storage._mpmName)
         case 3: try decoder.decodeSingularStringField(value: &_storage._publicVersion)
         case 4: try decoder.decodeRepeatedStringField(value: &_storage._mpmPattern)
-        case 5: try decoder.decodeSingularMessageField(value: &_storage._buildFlags)
+        case 5: try decoder.decodeSingularMessageField(value: &_storage._blazeFlags)
         case 6: try decoder.decodeRepeatedStringField(value: &_storage._nightlyMpmPattern)
         case 7: try decoder.decodeSingularBoolField(value: &_storage._openSource)
         case 8: try decoder.decodeSingularBoolField(value: &_storage._stripI386)
         case 9: try decoder.decodeRepeatedStringField(value: &_storage._buildTarget)
         case 10: try decoder.decodeSingularBoolField(value: &_storage._strip32Bits)
+        case 11: try decoder.decodeSingularBoolField(value: &_storage._publicPod)
+        case 12: try decoder.decodeSingularBoolField(value: &_storage._noBuiltinFlags)
+        case 13: try decoder.decodeSingularBoolField(value: &_storage._buildArm64E)
         default: break
         }
       }
@@ -260,7 +288,7 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
       if !_storage._mpmPattern.isEmpty {
         try visitor.visitRepeatedStringField(value: _storage._mpmPattern, fieldNumber: 4)
       }
-      if let v = _storage._buildFlags {
+      if let v = _storage._blazeFlags {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
       }
       if !_storage._nightlyMpmPattern.isEmpty {
@@ -278,6 +306,15 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
       if _storage._strip32Bits != false {
         try visitor.visitSingularBoolField(value: _storage._strip32Bits, fieldNumber: 10)
       }
+      if _storage._publicPod != false {
+        try visitor.visitSingularBoolField(value: _storage._publicPod, fieldNumber: 11)
+      }
+      if _storage._noBuiltinFlags != false {
+        try visitor.visitSingularBoolField(value: _storage._noBuiltinFlags, fieldNumber: 12)
+      }
+      if _storage._buildArm64E != false {
+        try visitor.visitSingularBoolField(value: _storage._buildArm64E, fieldNumber: 13)
+      }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -291,12 +328,15 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
         if _storage._mpmName != rhs_storage._mpmName {return false}
         if _storage._publicVersion != rhs_storage._publicVersion {return false}
         if _storage._mpmPattern != rhs_storage._mpmPattern {return false}
-        if _storage._buildFlags != rhs_storage._buildFlags {return false}
+        if _storage._blazeFlags != rhs_storage._blazeFlags {return false}
         if _storage._nightlyMpmPattern != rhs_storage._nightlyMpmPattern {return false}
         if _storage._openSource != rhs_storage._openSource {return false}
         if _storage._stripI386 != rhs_storage._stripI386 {return false}
         if _storage._buildTarget != rhs_storage._buildTarget {return false}
         if _storage._strip32Bits != rhs_storage._strip32Bits {return false}
+        if _storage._publicPod != rhs_storage._publicPod {return false}
+        if _storage._noBuiltinFlags != rhs_storage._noBuiltinFlags {return false}
+        if _storage._buildArm64E != rhs_storage._buildArm64E {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -306,13 +346,13 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
   }
 }
 
-extension ZipBuilder_BuildFlag: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let protoMessageName: String = _protobuf_package + ".BuildFlag"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ZipBuilder_BlazeFlag: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".BlazeFlag"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "flag"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       switch fieldNumber {
       case 1: try decoder.decodeRepeatedStringField(value: &self.flag)
@@ -321,14 +361,14 @@ extension ZipBuilder_BuildFlag: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.flag.isEmpty {
       try visitor.visitRepeatedStringField(value: self.flag, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  public static func ==(lhs: ZipBuilder_BuildFlag, rhs: ZipBuilder_BuildFlag) -> Bool {
+  static func ==(lhs: ZipBuilder_BlazeFlag, rhs: ZipBuilder_BlazeFlag) -> Bool {
     if lhs.flag != rhs.flag {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true

ZipBuilder/Sources/ManifestReader/FirebaseSDKs.proto

@@ -2,47 +2,54 @@ syntax = "proto3";
 
 package ZipBuilder;
 
-// A list of all Firebase SDKs.
 message FirebaseSDKs {
   repeated SDK sdk = 1;
 }
 
-// Represents a single SDK that should be released.
 message SDK {
-  // SDK name
+  // SDK name.
   string name = 1;
 
-  // MPM name for the blueprint. For internal use only.
+  // MPM name for the blueprint.
   string mpm_name = 2;
 
-  // Public version
+  // Public version.
   string public_version = 3;
 
-  // List of MPM patterns to build
+  // List of MPM patterns to build.
   repeated string mpm_pattern = 4;
 
-  // An optional list of additional build flags. For internal use only.
-  BuildFlag build_flags = 5;
+  // An optional list of additional blaze flags.
+  BlazeFlag blaze_flags = 5;
 
-  // List of MPM patterns to build (optional nightly override). For internal use only.
+  // List of MPM patterns to build (optional nightly override).
   repeated string nightly_mpm_pattern = 6;
 
-  // Whether or not the SDK is built from open-source. For internal use only.
+  // Whether or not the SDK is built from open-source.
   bool open_source = 7;
 
   // Whether or not to strip the i386 architecture from the build.
   bool strip_i386 = 8;
 
-  // List of build targets. For internal use only.
+  // List of build targets to build the SDK - used for collecting licenses.
   repeated string build_target = 9;
 
   // Whether or not to strip both the i386 and armv7 architectures from the
-  // build. All SDKs that use this flag are built internally so this should be ignored.
+  // build.
   bool strip_32bits = 10;
+
+  // Specifies if the provided pod should be fetched from public repo.
+  // Mainly use for clash testing.
+  bool public_pod = 11;
+
+  // Whether or not to use the builtin flags.
+  bool no_builtin_flags = 12;
+
+  // Whether or not to build arm64e slice.
+  bool build_arm64e = 13;
 }
 
-// Any extra build flags needed to build the SDK. For internal use only.
-message BuildFlag {
-  // An additional build flag needed to build the SDK
+message BlazeFlag {
+  // An additional blaze flag needed to build the SDK.
   repeated string flag = 1;
 }