From 379a5cd1bc7e499f54809243d31331b05d5f7694 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Sat, 19 Sep 2026 11:45:31 +0300 Subject: [PATCH] Drop Intel device support from the build scripts and project --- ElementX.xcodeproj/project.pbxproj | 4 ++-- Tools/Sources/Commands/BuildSDK.swift | 9 +-------- project.yml | 4 +--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 028c7707e..5f4d14260 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10322,6 +10322,7 @@ APP_DISPLAY_NAME = "Element X"; APP_GROUP_IDENTIFIER = group.io.element; APP_NAME = ElementX; + ARCHS = arm64; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color"; BASE_BUNDLE_IDENTIFIER = io.element.elementx; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -10365,7 +10366,6 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -10398,6 +10398,7 @@ APP_DISPLAY_NAME = "Element X"; APP_GROUP_IDENTIFIER = group.io.element; APP_NAME = ElementX; + ARCHS = arm64; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color"; BASE_BUNDLE_IDENTIFIER = io.element.elementx; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -10441,7 +10442,6 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; diff --git a/Tools/Sources/Commands/BuildSDK.swift b/Tools/Sources/Commands/BuildSDK.swift index 4635e1d43..21da92cee 100644 --- a/Tools/Sources/Commands/BuildSDK.swift +++ b/Tools/Sources/Commands/BuildSDK.swift @@ -11,9 +11,7 @@ enum Profile: String, ExpressibleByArgument { enum Target: String, ExpressibleByArgument, CaseIterable { case iOS = "aarch64-apple-ios" case simulatorARM64 = "aarch64-apple-ios-sim" - case simulatorIntel = "x86_64-apple-ios" case macARM64 = "aarch64-apple-darwin" - case macIntel = "x86_64-apple-darwin" } struct BuildSDK: AsyncParsableCommand { @@ -104,12 +102,7 @@ struct BuildSDK: AsyncParsableCommand { if device > 0 { buildCommand.append(" --target \(Target.iOS.rawValue)") } else if simulator > 0 { - let hostArchitecture = try Zsh.run(command: "arch") - if hostArchitecture?.trimmingCharacters(in: .whitespacesAndNewlines) == "arm64" { - buildCommand.append(" --target \(Target.simulatorARM64.rawValue)") - } else { - buildCommand.append(" --target \(Target.simulatorIntel.rawValue)") - } + buildCommand.append(" --target \(Target.simulatorARM64.rawValue)") } else if !target.isEmpty { target.forEach { buildCommand.append(" --target \($0.rawValue)") } } diff --git a/project.yml b/project.yml index 3aa9d9c1c..a0692d07f 100644 --- a/project.yml +++ b/project.yml @@ -54,9 +54,7 @@ settings: MARKETING_VERSION: 26.09.2 CURRENT_PROJECT_VERSION: 1 SUPPORTS_MACCATALYST: false - # The call package's media xcframework (libwebrtc) has no Intel simulator slice, and a package - # cannot declare this for the projects that consume it. - EXCLUDED_ARCHS[sdk=iphonesimulator*]: x86_64 + ARCHS: arm64 include: - path: app.yml