Skip to content

Commit 6ce5b23

Browse files
committed
Add release note about i386 no longer being supported.
1 parent 62e2e20 commit 6ce5b23

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

build_scripts/ios/Info.plist

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64_i386_x86_64-simulator</string>
9+
<string>ios-arm64_x86_64-simulator</string>
1010
<key>LibraryPath</key>
1111
<string>LIBRARY_PATH</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15-
<string>i386</string>
1615
<string>x86_64</string>
1716
</array>
1817
<key>SupportedPlatform</key>
@@ -39,4 +38,4 @@
3938
<key>XCFrameworkFormatVersion</key>
4039
<string>1.0</string>
4140
</dict>
42-
</plist>
41+
</plist>

build_scripts/ios/build.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2020 Google LLC
44
#
55
# Script to build iOS XCFrameworks
6-
# If built for all architectures (arm64 armv7 x86_64 i386),
6+
# If built for all architectures (arm64 armv7 x86_64),
77
# it will build universal framework as well
88
#
99

@@ -24,9 +24,9 @@ usage(){
2424
set -e
2525

2626
readonly SUPPORTED_PLATFORMS=(device simulator)
27-
readonly SUPPORTED_ARCHITECTURES=(arm64 armv7 x86_64 i386)
27+
readonly SUPPORTED_ARCHITECTURES=(arm64 armv7 x86_64)
2828
readonly DEVICE_ARCHITECTURES=(arm64 armv7)
29-
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64 i386)
29+
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
3030
readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage)
3131

3232
# build default value
@@ -198,7 +198,7 @@ if ${cmakeBuild}; then
198198
done
199199
done
200200

201-
# if we built for all architectures (arm64 armv7 x86_64 i386)
201+
# if we built for all architectures (arm64 armv7 x86_64)
202202
# build universal framework as well
203203
if [[ ${#architectures[@]} < ${#SUPPORTED_ARCHITECTURES[@]} ]]; then
204204
exit 0
@@ -210,7 +210,6 @@ if ${cmakeBuild}; then
210210
libsubpath="${target}.framework/${target}"
211211
lipo -create "device-arm64/${libsubpath}" \
212212
"device-armv7/${libsubpath}" \
213-
"simulator-i386/${libsubpath}" \
214213
"simulator-x86_64/${libsubpath}" \
215214
-output "universal/${libsubpath}"
216215
done
@@ -235,10 +234,9 @@ if ${cmakeBuild}; then
235234
-output "${outputdir}/${target}"
236235

237236
elif [[ "${platform}" == "simulator" ]]; then
238-
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_i386_x86_64-simulator/${target}.framework"
237+
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_x86_64-simulator/${target}.framework"
239238
mkdir -p ${outputdir}
240239
lipo -create "${frameworkspath}/simulator-arm64/${libsubpath}" \
241-
"${frameworkspath}/simulator-i386/${libsubpath}" \
242240
"${frameworkspath}/simulator-x86_64/${libsubpath}" \
243241
-output "${outputdir}/${target}"
244242
fi
@@ -256,7 +254,7 @@ if ${cmakeBuild}; then
256254
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
257255
${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers
258256
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
259-
${xcframeworkspath}/firebase.xcframework/ios-arm64_i386_x86_64-simulator/firebase.framework/Headers
257+
${xcframeworkspath}/firebase.xcframework/ios-arm64_x86_64-simulator/firebase.framework/Headers
260258
fi
261259
echo "xcframeworks build end & ready to use"
262260
fi

build_scripts/tvos/Info_ios_and_tvos.plist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64_i386_x86_64-simulator</string>
9+
<string>ios-arm64_x86_64-simulator</string>
1010
<key>LibraryPath</key>
1111
<string>LIBRARY_PATH</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15-
<string>i386</string>
1615
<string>x86_64</string>
1716
</array>
1817
<key>SupportedPlatform</key>

build_scripts/tvos/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ if ${cmakeBuild}; then
200200
done
201201
done
202202

203-
# if we built for all architectures (arm64 armv7 x86_64 i386)
203+
# if we built for all architectures (arm64 armv7 x86_64)
204204
# build universal framework as well
205205
if [[ ${#architectures[@]} < ${#SUPPORTED_ARCHITECTURES[@]} ]]; then
206206
exit 0

release_build_files/readme.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,11 @@ workflow use only during the development of your app, not for publicly shipping
627627
code.
628628

629629
## Release Notes
630-
### Upcoming Release
630+
### 11.4.0
631631
- Changes
632+
- General (Android): Update to Firebase Android BoM version 32.2.2.
633+
- General (iOS): Update to Firebase Cocoapods version 10.13.0.
634+
- General (iOS): 32-bit (i386) iOS simulator builds are no longer supported.
632635
- GMA (Android): Fixed a crash when initializing GMA without a Firebase App.
633636

634637
### 11.3.0

scripts/gha/build_ios_tvos.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
'toolchain' : 'cmake/toolchains/ios.cmake',
6060
},
6161
'simulator': {
62-
'architectures' : ('arm64', 'x86_64', 'i386'),
62+
'architectures' : ('arm64', 'x86_64'),
6363
'toolchain': 'cmake/toolchains/ios_simulator.cmake',
6464
}
6565
},
@@ -140,7 +140,7 @@ def build_universal_framework(frameworks_path, targets):
140140
- firebase.framework
141141
- firebase_analytics.framework
142142
...
143-
- simulator-i386
143+
- simulator-x86_64
144144
...
145145
- tvos
146146
- device-arm64
@@ -154,7 +154,7 @@ def build_universal_framework(frameworks_path, targets):
154154
- ios
155155
- device-arm64
156156
...
157-
- simulator-i386
157+
- simulator-x86_64
158158
...
159159
...
160160
- universal <-------------- Newly created
@@ -291,7 +291,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
291291
- firebase.framework
292292
- firebase_analytics.framework
293293
...
294-
- simulator-i386
294+
- simulator-x86_64
295295
...
296296
- tvos
297297
- device-arm64
@@ -308,7 +308,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
308308
- firebase.framework
309309
- firebase <---- <library>
310310
- Headers <---- <all_include_headers>
311-
- ios-arm64_i386_x86_64-simulator <--- <for_ios_simulator>
311+
- ios-arm64_x86_64-simulator <--- <for_ios_simulator>
312312
- firebase.framework
313313
- firebase
314314
- Headers
@@ -323,7 +323,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
323323
- ios-arm64_armv7
324324
- firebase_auth.framework
325325
- firebase_auth
326-
- ios-arm64_i386_x86_64-simulator
326+
- ios-arm64_x86_64-simulator
327327
- firebase_auth.framework
328328
- firebase_auth
329329
- tvos-arm64
@@ -584,7 +584,7 @@ def parse_cmdline_args():
584584
default=('device', 'simulator'),
585585
help='List of platforms to build for.')
586586
parser.add_argument('-a', '--architecture', nargs='+',
587-
default=('arm64', 'armv7', 'x86_64', 'i386'),
587+
default=('arm64', 'armv7', 'x86_64'),
588588
help='List of architectures to build for.')
589589
parser.add_argument('-t', '--target', nargs='+',
590590
default=( 'firebase_analytics', 'firebase_app_check',

0 commit comments

Comments
 (0)