ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-05 20:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop Intel device support from the build scripts and project

Browse Source
This commit is contained in:
Stefan Ceriu
2026-09-19 11:45:31 +03:00
parent 223ddeae22
commit 379a5cd1bc
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+2 -2
View File
@@ -10322,6 +10322,7 @@
APP_DISPLAY_NAME = "Element X"; APP_DISPLAY_NAME = "Element X";
APP_GROUP_IDENTIFIER = group.io.element; APP_GROUP_IDENTIFIER = group.io.element;
APP_NAME = ElementX; APP_NAME = ElementX;
ARCHS = arm64;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color";
BASE_BUNDLE_IDENTIFIER = io.element.elementx; BASE_BUNDLE_IDENTIFIER = io.element.elementx;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -10365,7 +10366,6 @@
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -10398,6 +10398,7 @@
APP_DISPLAY_NAME = "Element X"; APP_DISPLAY_NAME = "Element X";
APP_GROUP_IDENTIFIER = group.io.element; APP_GROUP_IDENTIFIER = group.io.element;
APP_NAME = ElementX; APP_NAME = ElementX;
ARCHS = arm64;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color";
BASE_BUNDLE_IDENTIFIER = io.element.elementx; BASE_BUNDLE_IDENTIFIER = io.element.elementx;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -10441,7 +10442,6 @@
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
Tools/Sources/Commands/BuildSDK.swift
+1 -8
View File
@@ -11,9 +11,7 @@ enum Profile: String, ExpressibleByArgument {
enum Target: String, ExpressibleByArgument, CaseIterable { enum Target: String, ExpressibleByArgument, CaseIterable {
case iOS = "aarch64-apple-ios" case iOS = "aarch64-apple-ios"
case simulatorARM64 = "aarch64-apple-ios-sim" case simulatorARM64 = "aarch64-apple-ios-sim"
case simulatorIntel = "x86_64-apple-ios"
case macARM64 = "aarch64-apple-darwin" case macARM64 = "aarch64-apple-darwin"
case macIntel = "x86_64-apple-darwin"
} }
struct BuildSDK: AsyncParsableCommand { struct BuildSDK: AsyncParsableCommand {
@@ -104,12 +102,7 @@ struct BuildSDK: AsyncParsableCommand {
if device > 0 { if device > 0 {
buildCommand.append(" --target \(Target.iOS.rawValue)") buildCommand.append(" --target \(Target.iOS.rawValue)")
} else if simulator > 0 { } else if simulator > 0 {
let hostArchitecture = try Zsh.run(command: "arch") buildCommand.append(" --target \(Target.simulatorARM64.rawValue)")
if hostArchitecture?.trimmingCharacters(in: .whitespacesAndNewlines) == "arm64" {
buildCommand.append(" --target \(Target.simulatorARM64.rawValue)")
} else {
buildCommand.append(" --target \(Target.simulatorIntel.rawValue)")
}
} else if !target.isEmpty { } else if !target.isEmpty {
target.forEach { buildCommand.append(" --target \($0.rawValue)") } target.forEach { buildCommand.append(" --target \($0.rawValue)") }
} }
project.yml
+1 -3
View File
@@ -54,9 +54,7 @@ settings:
MARKETING_VERSION: 26.09.2 MARKETING_VERSION: 26.09.2
CURRENT_PROJECT_VERSION: 1 CURRENT_PROJECT_VERSION: 1
SUPPORTS_MACCATALYST: false SUPPORTS_MACCATALYST: false
# The call package's media xcframework (libwebrtc) has no Intel simulator slice, and a package ARCHS: arm64
# cannot declare this for the projects that consume it.
EXCLUDED_ARCHS[sdk=iphonesimulator*]: x86_64
include: include:
- path: app.yml - path: app.yml