More of the clean up

Author: AustinBenoit

analytics/src/analytics_ios.mm

@@ -234,27 +234,6 @@ void LogEvent(const char* name) {
   [FIRAnalytics logEventWithName:@(name) parameters:@{}];
 }
 
-extern "C" {
-void CompleteLogAppleTransaction(const void* context, bool success) {
-  FIREBASE_ASSERT_RETURN_VOID(context != nullptr);
-  auto* handle_ptr = static_cast<SafeFutureHandle<void>*>(const_cast<void*>(context));
-
-  MutexLock lock(g_mutex);
-  if (!internal::IsInitialized()) {
-    delete handle_ptr;
-    return;
-  }
-
-  auto* api = internal::FutureData::Get()->api();
-  if (success) {
-    api->Complete(*handle_ptr, 0, "");
-  } else {
-    api->Complete(*handle_ptr, -1, "StoreKit 2 transaction not found.");
-  }
-  delete handle_ptr;
-}
-}
-
 Future<void> LogAppleTransaction(const char* transaction_id) {
   MutexLock lock(g_mutex);
   FIREBASE_ASSERT_RETURN(Future<void>(), internal::IsInitialized());
@@ -267,14 +246,17 @@ void CompleteLogAppleTransaction(const void* context, bool success) {
     return Future<void>(api, future_handle.get());
   }
 
-  SafeFutureHandle<void>* handle_ptr = new SafeFutureHandle<void>(future_handle);
-
-  // 2. Call Swift using a standard Objective-C block.
-  // We capture the C++ handle_ptr inside the Objective-C block. Swift never sees it.
   [AppleTransactionVerifier verifyWithTransactionId:SafeString(transaction_id) 
                                        completion:^(BOOL isFound) {
-      // 3. We are back in C++ land. Call your completion logic directly.
-      CompleteLogAppleTransaction(handle_ptr, isFound == YES);
+    MutexLock lock(g_mutex);
+    if (!internal::IsInitialized()) return;
+
+    auto* api = internal::FutureData::Get()->api();
+    if (isFound) {
+      api->Complete(future_handle, 0, "");
+    } else {
+      api->Complete(future_handle, -1, "StoreKit 2 transaction not found.");
+    }
   }];
 
   return Future<void>(api, future_handle.get());

analytics/src/ios/swift/AppleTransactionVerifier.swift

@@ -21,6 +21,11 @@ import FirebaseAnalytics
     @objc public static func verify(transactionId: String, completion: @escaping @Sendable (Bool) -> Void) {
         if #available(iOS 15.0, tvOS 15.0, macOS 12.0, watchOS 8.0, *) {
             Task {
+                // Using a manual while loop instead of `for await` avoids a Swift 6 / Xcode 16
+                // compiler issue. Using `for await` causes the compiler to emit a call to the
+                // new `next(isolation:)` signature on the generic AsyncIteratorProtocol witness table.
+                // This symbol does not exist in the iOS 16 `libswift_Concurrency.dylib` runtime,
+                // which causes an immediate `dyld: Symbol not found` crash upon launch.
                 var iterator = Transaction.all.makeAsyncIterator()
                 while let verificationResult = await iterator.next() {
                     if case .verified(let transaction) = verificationResult {

build_scripts/ios/build.sh

@@ -1,7 +1,5 @@
 #!/bin/bash -e
 
-export LANG=en_US.UTF-8
-
 # Copyright 2020 Google LLC
 #
 # Script to build iOS XCFrameworks
@@ -125,7 +123,7 @@ if ${generateMakefiles}; then
         for arch in ${architectures[@]}; do 
             sysroot_arg=""
             if [[ "${platform}" == "device" && " ${DEVICE_ARCHITECTURES[@]} " =~ " ${arch} " ]]; then
-                sysroot_arg="-DCMAKE_OSX_SYSROOT=iphoneos"
+                sysroot_arg="" # Default iphoneos sysroot is correct for iOS devices
             elif [[ "${platform}" == "simulator" && " ${SIMULATOR_ARCHITECTURES[@]} " =~ " ${arch} " ]]; then
                 sysroot_arg="-DCMAKE_OSX_SYSROOT=iphonesimulator" # Must specify sysroot for simulator, especially for x86_64
             else

release_build_files/readme.md

@@ -268,14 +268,6 @@ Note: Parts of the Firebase iOS SDK are written in Swift. If your application
 does not use any Swift code, you may need to add an empty .swift file to your
 Xcode project to ensure that the Swift runtime is included in your app.
 
-Additionally, to resolve known Xcode 15+ crashes when deploying to iOS 15 or 16,
-you must add `-Wl,-weak-lswift_Concurrency` to your `OTHER_LDFLAGS` (Other
-Linker Flags). If your application crashes with a 'Symbol not found' error for
-`__libcpp_verbose_abort`, you should also add
-`-D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY` to your
-`OTHER_CPLUSPLUSFLAGS` (Other C++ Flags), or provide a fallback implementation
-in your code (e.g., `extern "C" void __libcpp_verbose_abort(const char* f, ...) { abort(); }`).
-
 #### Libraries
 
 If you prefer to link against static libraries instead of xcframeworks (see the
@@ -335,14 +327,6 @@ Note: Parts of the Firebase iOS SDK are written in Swift. If your application
 does not use any Swift code, you may need to add an empty .swift file to your
 Xcode project to ensure that the Swift runtime is included in your app.
 
-Additionally, to resolve known Xcode 15+ crashes when deploying to iOS 15 or 16,
-you must add `-Wl,-weak-lswift_Concurrency` to your `OTHER_LDFLAGS` (Other
-Linker Flags). If your application crashes with a 'Symbol not found' error for
-`__libcpp_verbose_abort`, you should also add
-`-D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY` to your
-`OTHER_CPLUSPLUSFLAGS` (Other C++ Flags), or provide a fallback implementation
-in your code (e.g., `extern "C" void __libcpp_verbose_abort(const char* f, ...) { abort(); }`).
-
 ### Desktop Implementation Dependencies
 
 #### Linux libraries
@@ -634,7 +618,6 @@ code.
     - Functions (general): Add in support for Limited Use Tokens.
     - Storage: Added `List` API for all platforms, which gets the list of items under a `StorageReference`
     - Analytics: Add in `LogAppleTransaction` for logging Storekit 2 transactions on iOS.
-    - General (iOS): Added `-Wl,-weak-lswift_Concurrency` and `-D_LIBCPP_HAS_NO_VERBOSE_ABORT` flags to resolve Xcode 15+ launch crashes on iOS 15 and 16.
 
 ### 13.5.0
 -   Changes

scripts/gha/integration_testing/xcode_tool.rb

@@ -89,7 +89,6 @@ def main
 
   framework_dir = "#@xcode_project_dir/Frameworks"
   set_build_setting('FRAMEWORK_SEARCH_PATHS', ['${inherited}', framework_dir])
-
   if !@include_path.nil?
     append_to_build_setting('HEADER_SEARCH_PATHS', @include_path)
   end