Skip to content

Commit 9295295

Browse files
authored
Remove iOS 32-bit support (#823)
1 parent ae3bbb9 commit 9295295

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

cmake/unity_ios.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(CMAKE_SYSTEM_NAME "iOS")
2323
# the long term fix will likely be to not handle both device and simulator with
2424
# the same toolchain, and instead merge the libraries after the fact.
2525
set(CMAKE_OSX_SYSROOT "")
26-
set(CMAKE_OSX_ARCHITECTURES "arm64;armv7;x86_64;i386" CACHE STRING "")
26+
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
2727
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
2828
set(IOS_PLATFORM_LOCATION "iPhoneOS.platform;iPhoneSimulator.platform")
2929

docs/readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ Support
7171

7272
Release Notes
7373
-------------
74+
### Upcoming changes
75+
- Changes
76+
- General (iOS): 32-bit iOS builds (i386 and armv7) are no longer supported.
77+
7478
### 11.3.0
7579
- Changes
7680
- General: Update to Firebase C++ SDK version 11.3.0.

scripts/build_scripts/build_zips.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
]
4343
SUPPORT_DEVICE = ["device", "simulator"]
4444

45-
IOS_SUPPORT_ARCHITECTURE = ["arm64", "armv7", "x86_64", "i386"]
46-
IOS_DEVICE_ARCHITECTURE = ["arm64", "armv7"]
47-
IOS_SIMULATOR_ARCHITECTURE = ["arm64", "x86_64", "i386"]
45+
IOS_SUPPORT_ARCHITECTURE = ["arm64", "x86_64"]
46+
IOS_DEVICE_ARCHITECTURE = ["arm64"]
47+
IOS_SIMULATOR_ARCHITECTURE = ["arm64", "x86_64"]
4848

4949
IOS_CONFIG_DICT = {
5050
"device": {
51-
"architecture": ["arm64", "armv7"],
51+
"architecture": ["arm64"],
5252
"ios_platform_location": "iPhoneOS.platform",
5353
"osx_sysroot": "iphoneos",
5454
},
5555
"simulator": {
56-
"architecture": ["arm64", "x86_64", "i386"],
56+
"architecture": ["arm64", "x86_64"],
5757
"ios_platform_location": "iPhoneSimulator.platform",
5858
"osx_sysroot": "iphonesimulator",
5959
}

scripts/gha/integration_testing/gameloop_apple/gameloop/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<string>Main</string>
2929
<key>UIRequiredDeviceCapabilities</key>
3030
<array>
31-
<string>armv7</string>
31+
<string>arm64</string>
3232
</array>
3333
<key>UISupportedInterfaceOrientations</key>
3434
<array>

0 commit comments

Comments
 (0)