Skip to content

Commit ebfe3e3

Browse files
authored
Don't build 32 bit archs for >= iOS 11 (#9142)
1 parent 2ff7230 commit ebfe3e3

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ struct FrameworkBuilder {
2222
/// Platforms to be included in the built frameworks.
2323
private let targetPlatforms: [TargetPlatform]
2424

25+
/// Minimum Version
26+
private let minimumVersion: Float
27+
2528
/// The directory containing the Xcode project and Pods folder.
2629
private let projectDir: URL
2730

@@ -37,6 +40,10 @@ struct FrameworkBuilder {
3740
init(projectDir: URL, platform: Platform, dynamicFrameworks: Bool) {
3841
self.projectDir = projectDir
3942
targetPlatforms = platform.platformTargets
43+
guard let minVersion = Float(platform.minimumVersion) else {
44+
fatalError("Invalid minimum version: \(platform.minimumVersion)")
45+
}
46+
minimumVersion = minVersion
4047
self.dynamicFrameworks = dynamicFrameworks
4148
}
4249

@@ -189,9 +196,7 @@ struct FrameworkBuilder {
189196

190197
var archs = targetPlatform.archs.map { $0.rawValue }.joined(separator: " ")
191198
// The 32 bit archs do not build for iOS 11.
192-
// TODO: Make a more robust solution if we need to support more of a mix between iOS 11 and
193-
// under.
194-
if framework == "FirebaseAppCheck" {
199+
if framework == "FirebaseAppCheck" || minimumVersion >= 11.0 {
195200
if targetPlatform == .iOSDevice {
196201
archs = "arm64"
197202
} else if targetPlatform == .iOSSimulator {

0 commit comments

Comments
 (0)