simplify the build as we have xcode 16 as minimum and we only support ios 15+ which should bundle the concurrency headers

Author: AustinBenoit

CMakeLists.txt

@@ -100,7 +100,7 @@ set(FIREBASE_CPP_SDK_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 project (firebase NONE)
 
-set(CMAKE_Swift_LANGUAGE_VERSION 5.9)
+set(CMAKE_Swift_LANGUAGE_VERSION 6.2)
 
 enable_language(C)
 enable_language(CXX)

analytics/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -376,7 +376,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -421,7 +421,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -460,7 +460,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
@@ -494,7 +494,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
@@ -527,7 +527,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -583,7 +583,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
-				OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
+				OTHER_LDFLAGS = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ANALYZER_NONNULL = YES;

analytics/src/ios/swift/AppleTransactionVerifier.swift

@@ -42,7 +42,7 @@ internal struct AppleTransactionWorker {
     // Notice: To avoid C-pointer ABI layout issues across Swift boundaries, 
     // this interface relies purely on a standard Swift closure. The calling 
     // C++ layer captures any necessary pointers within an Objective-C block.
-    @objc public static func verify(transactionId: String, completion: @escaping (Bool) -> Void) {
+    @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, *) {
             // Create a pure Swift String copy of the transaction ID.
             // This ensures we do not rely on the memory of the bridged Objective-C

scripts/gha/integration_testing/xcode_tool.rb

@@ -88,7 +88,17 @@ def main
   end
 
   framework_dir = "#@xcode_project_dir/Frameworks"
-  set_build_setting('FRAMEWORK_SEARCH_PATHS', ['${inherited}', framework_dir])
+  framework_search_paths = ['${inherited}', framework_dir]
+  
+  @frameworks.each do |framework|
+    framework_name = File.basename(framework)
+    if framework_name.end_with?('.xcframework')
+      framework_search_paths << "#{framework_dir}/#{framework_name}/ios-arm64_x86_64-simulator"
+    end
+  end
+
+  set_build_setting('FRAMEWORK_SEARCH_PATHS', framework_search_paths)
+
   if !@include_path.nil?
     append_to_build_setting('HEADER_SEARCH_PATHS', @include_path)
   end
@@ -163,6 +173,9 @@ def add_custom_framework(framework_path)
   local_framework_path = "Frameworks/#{framework_name}"
   # Add the lib file as a reference
   libRef = @project['Frameworks'].new_file(framework_path)
+  if framework_name.end_with?('.xcframework')
+    libRef.last_known_file_type = 'wrapper.xcframework'
+  end
   # Add it to the build phase
   @target.frameworks_build_phase.add_file_reference(libRef)
   puts 'Finished adding framework.'

setup_integration_tests.py

@@ -58,17 +58,5 @@
         print('Copying %s to %s' % (src, dest))
         copy_tree(src, dest, update=1)
 
-        # Workaround for Xcode 15 / Swift 5.10 Concurrency crash on iOS 15 and 16
-        pbxproj_path = os.path.join(dest, "integration_test.xcodeproj", "project.pbxproj")
-        if os.path.exists(pbxproj_path):
-            with open(pbxproj_path, "r") as f:
-                pbx_content = f.read()
-            if "-Wl,-weak-lswift_Concurrency" not in pbx_content:
-                pbx_content = pbx_content.replace(
-                    "buildSettings = {",
-                    "buildSettings = {\n\t\t\t\tOTHER_CPLUSPLUSFLAGS = \"$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY\";\n\t\t\t\tOTHER_LDFLAGS = \"-Wl,-weak-lswift_Concurrency\";"
-                )
-                with open(pbxproj_path, "w") as f:
-                    f.write(pbx_content)
-                print("Patched " + pbxproj_path + " for Swift Concurrency backwards compatibility.")
+