Remove armv7 as well.

Author: jonsimantov

build_scripts/ios/build.sh

@@ -3,7 +3,7 @@
 # Copyright 2020 Google LLC
 #
 # Script to build iOS XCFrameworks
-# If built for all architectures (arm64 armv7 x86_64),
+# If built for all architectures (arm64 x86_64),
 # it will build universal framework as well
 #
 
@@ -24,8 +24,8 @@ usage(){
 set -e
 
 readonly SUPPORTED_PLATFORMS=(device simulator)
-readonly SUPPORTED_ARCHITECTURES=(arm64 armv7 x86_64)
-readonly DEVICE_ARCHITECTURES=(arm64 armv7)
+readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
+readonly DEVICE_ARCHITECTURES=(arm64)
 readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
 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)
 
@@ -198,7 +198,7 @@ if ${cmakeBuild}; then
         done
     done
 
-    # if we built for all architectures (arm64 armv7 x86_64)
+    # if we built for all architectures (arm64 x86_64)
     # build universal framework as well
     if [[ ${#architectures[@]} < ${#SUPPORTED_ARCHITECTURES[@]} ]]; then
         exit 0
@@ -209,7 +209,6 @@ if ${cmakeBuild}; then
         mkdir -p universal/${target}.framework
         libsubpath="${target}.framework/${target}"
         lipo -create "device-arm64/${libsubpath}" \
-                    "device-armv7/${libsubpath}" \
                     "simulator-x86_64/${libsubpath}" \
             -output "universal/${libsubpath}"
     done
@@ -227,10 +226,9 @@ if ${cmakeBuild}; then
         for target in ${targets[@]}; do
             libsubpath="${target}.framework/${target}" 
             if [[ "${platform}" == "device" ]]; then
-                outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_armv7/${target}.framework"
+                outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64/${target}.framework"
                 mkdir -p ${outputdir}
                 lipo -create "${frameworkspath}/device-arm64/${libsubpath}" \
-                            "${frameworkspath}/device-armv7/${libsubpath}" \
                     -output "${outputdir}/${target}"
 
             elif [[ "${platform}" == "simulator" ]]; then
@@ -250,9 +248,9 @@ if ${cmakeBuild}; then
     done
 
     # create Headers for xcframework
-    if [[ ! -d "${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers" ]]; then
+    if [[ ! -d "${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers" ]]; then
         cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers  \
-            ${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers
+            ${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers
         cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers  \
             ${xcframeworkspath}/firebase.xcframework/ios-arm64_x86_64-simulator/firebase.framework/Headers
     fi

ios_pod/swift_headers/FirebaseStorage-Swift.h

@@ -1,4 +1,6 @@
 #if 0
+#elif defined(__armv7__) && __armv7__
+#error OOPS WE ARE BUILDING FOR 32-BIT
 #elif defined(__arm64__) && __arm64__
 // Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3 clang-1400.0.29.51)
 #ifndef FIREBASESTORAGE_SWIFT_H

release_build_files/readme.md

@@ -631,7 +631,7 @@ code.
 -   Changes
     - General (Android): Update to Firebase Android BoM version 32.2.2.
     - General (iOS): Update to Firebase Cocoapods version 10.13.0.
-    - General (iOS): 32-bit (i386) iOS simulator builds are no longer supported.
+    - General (iOS): 32-bit iOS builds (i386 and armv7) are no longer supported.
     - GMA (Android): Fixed a crash when initializing GMA without a Firebase App.
 
 ### 11.3.0

scripts/gha/build_ios_tvos.py

@@ -55,7 +55,7 @@
                            'firebase_installations', 'firebase_messaging',
                            'firebase_remote_config', 'firebase_storage'),
     'device': {
-      'architectures' : ('arm64', 'armv7'),
+      'architectures' : ('arm64'),
       'toolchain' : 'cmake/toolchains/ios.cmake',
     },
     'simulator': {
@@ -127,7 +127,7 @@ def arrange_frameworks(archive_output_path):
 def build_universal_framework(frameworks_path, targets):
   """Create universal frameworks if possible.
 
-  If all architectures (eg: arm64, armv7 etc) and platforms (device, simulator)
+  If all architectures (eg: arm64, etc) and platforms (device, simulator)
   were built, combine all of the libraries into a single universal framework.
   Args:
       frameworks_path (str): Root path containing subdirectories for each
@@ -178,7 +178,7 @@ def build_universal_framework(frameworks_path, targets):
     framework_os_path = os.path.join(frameworks_path, apple_os)
     # Extract list of all built platform-architecture combinations into a map.
     # Map looks like this,
-    # {'device': ['arm64', 'armv7'], 'simulator': ['x86_64']}
+    # {'device': ['arm64''], 'simulator': ['x86_64']}
     platform_variant_architecture_dirs = os.listdir(framework_os_path)
     platform_variant_arch_map = defaultdict(list)
     for variant_architecture in platform_variant_architecture_dirs:
@@ -273,7 +273,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
   """Build xcframeworks combining libraries for different operating systems.
 
   Combine frameworks for different operating systems (ios, tvos), architectures
-  (arm64, armv7, x86_64 etc) per platform variant (device, simulator).
+  (arm64, x86_64 etc) per platform variant (device, simulator).
   This makes it super convenient for developers to use a single deliverable in
   XCode and develop for multiple platforms/operating systems in one project.
 
@@ -304,7 +304,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
         Output: <build_dir>/xcframeworks        <----------- <xcframeworks_path>
                 - firebase.xcframework
                   - Info.plist                  <----------- <Info.plist file>
-                  - ios-arm64_armv7           <-- <all_libraries_for_ios_device>
+                  - ios-arm64           <-- <all_libraries_for_ios_device>
                     - firebase.framework
                       - firebase                <---- <library>
                       - Headers                 <---- <all_include_headers>
@@ -320,7 +320,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
                   ...
                 - firebase_auth.xcframework   <-- <firebase_auth target>
                   - Info.plist
-                  - ios-arm64_armv7
+                  - ios-arm64
                     - firebase_auth.framework
                       - firebase_auth
                   - ios-arm64_x86_64-simulator
@@ -340,7 +340,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
     platform_variant_architecture_dirs = os.listdir(framework_os_path)
     # Extract list of all built platform-architecture combinations into a map.
     # Map looks like this,
-    # {'device': ['arm64', 'armv7'], 'simulator': ['x86_64']}
+    # {'device': ['arm64'], 'simulator': ['x86_64']}
     platform_variant_arch_map = defaultdict(list)
     for variant_architecture in platform_variant_architecture_dirs:
       # Skip directories not of the format platform-arch (eg: universal)
@@ -385,7 +385,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
           # device is treated as default platform variant and we do not add any
           # suffix at the end. For all other variants, add them as suffix.
           xcframework_key_parts.append(platform_variant)
-        # Eg: ios-arm64_armv7, tvos-x86_64-simulator
+        # Eg: ios-arm64, tvos-x86_64-simulator
         xcframework_key = '-'.join(xcframework_key_parts)
 
         # <build_dir>/xcframeworks/<target>.xcframework/<os>-<list_of_archs>/
@@ -584,7 +584,7 @@ def parse_cmdline_args():
     default=('device', 'simulator'),
     help='List of platforms to build for.')
   parser.add_argument('-a', '--architecture', nargs='+',
-    default=('arm64', 'armv7', 'x86_64'),
+    default=('arm64', 'x86_64'),
     help='List of architectures to build for.')
   parser.add_argument('-t', '--target', nargs='+',
     default=( 'firebase_analytics', 'firebase_app_check',