Merge branch 'main' into perf-spm

.github/workflows/all_plugins.yaml

@@ -126,7 +126,7 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 30
     env:
-      FLUTTER_DEPENDENCIES: "cloud_firestore firebase_remote_config cloud_functions firebase_database firebase_auth firebase_storage firebase_analytics firebase_messaging firebase_app_check firebase_performance"
+      FLUTTER_DEPENDENCIES: "cloud_firestore firebase_remote_config cloud_functions firebase_database firebase_auth firebase_storage firebase_analytics firebase_messaging firebase_app_check firebase_in_app_messaging firebase_performance"
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225

packages/firebase_in_app_messaging/firebase_in_app_messaging/example/ios/Flutter/Debug.xcconfig

@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

packages/firebase_in_app_messaging/firebase_in_app_messaging/example/ios/Flutter/Release.xcconfig

@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging.podspec

@@ -24,8 +24,8 @@ Pod::Spec.new do |s|
   s.license          = { :file => '../LICENSE' }
   s.author           = 'The Chromium Authors'
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files     = 'firebase_in_app_messaging/Sources/firebase_in_app_messaging/**/*.{h,m}'
+  s.public_header_files = 'firebase_in_app_messaging/Sources/firebase_in_app_messaging/include/*.h'
   s.dependency 'Flutter'
   s.dependency 'firebase_core'
   s.dependency 'Firebase/InAppMessaging', firebase_sdk_version
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
 
   s.pod_target_xcconfig = {
-    'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{library_version}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fiam\\\"",
+    'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\\"#{library_version}\\\" LIBRARY_NAME=\\\"flutter-fire-fiam\\\"",
     'DEFINES_MODULE' => 'YES'
   }
 end

packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift

@@ -0,0 +1,121 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+// Copyright 2024, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import Foundation
+import PackageDescription
+
+enum ConfigurationError: Error {
+  case fileNotFound(String)
+  case parsingError(String)
+  case invalidFormat(String)
+}
+
+let firebaseInAppMessagingDirectory = String(URL(string: #file)!.deletingLastPathComponent()
+  .absoluteString
+  .dropLast())
+
+func loadFirebaseSDKVersion() throws -> String {
+  let firebaseCoreScriptPath = NSString.path(withComponents: [
+    firebaseInAppMessagingDirectory,
+    "..",
+    "generated_firebase_sdk_version.txt",
+  ])
+  do {
+    let version = try String(contentsOfFile: firebaseCoreScriptPath, encoding: .utf8)
+      .trimmingCharacters(in: .whitespacesAndNewlines)
+    return version
+  } catch {
+    throw ConfigurationError
+      .fileNotFound("Error loading or parsing generated_firebase_sdk_version.txt: \(error)")
+  }
+}
+
+func loadPubspecVersions() throws -> (packageVersion: String, firebaseCoreVersion: String) {
+  let pubspecPath = NSString.path(withComponents: [
+    firebaseInAppMessagingDirectory,
+    "..",
+    "..",
+    "pubspec.yaml",
+  ])
+  do {
+    let yamlString = try String(contentsOfFile: pubspecPath, encoding: .utf8)
+    let lines = yamlString.split(separator: "\n")
+
+    guard let packageVersionLine = lines.first(where: { $0.starts(with: "version:") }) else {
+      throw ConfigurationError.invalidFormat("No package version line found in pubspec.yaml")
+    }
+    var packageVersion = packageVersionLine.split(separator: ":")[1]
+      .trimmingCharacters(in: .whitespaces)
+      .replacingOccurrences(of: "+", with: "-")
+    packageVersion = packageVersion.replacingOccurrences(of: "^", with: "")
+
+    guard let firebaseCoreVersionLine = lines.first(where: { $0.contains("firebase_core:") }) else {
+      throw ConfigurationError
+        .invalidFormat("No firebase_core dependency version line found in pubspec.yaml")
+    }
+    var firebaseCoreVersion = firebaseCoreVersionLine.split(separator: ":")[1]
+      .trimmingCharacters(in: .whitespaces)
+    firebaseCoreVersion = firebaseCoreVersion.replacingOccurrences(of: "^", with: "")
+
+    return (packageVersion, firebaseCoreVersion)
+  } catch {
+    throw ConfigurationError.fileNotFound("Error loading or parsing pubspec.yaml: \(error)")
+  }
+}
+
+let library_version: String
+let firebase_sdk_version_string: String
+let firebase_core_version_string: String
+let shared_spm_tag = "-firebase-core-swift"
+
+do {
+  library_version = try loadPubspecVersions().packageVersion
+  firebase_sdk_version_string = try loadFirebaseSDKVersion()
+  firebase_core_version_string = try loadPubspecVersions().firebaseCoreVersion
+} catch {
+  fatalError("Failed to load configuration: \(error)")
+}
+
+guard let firebase_sdk_version = Version(firebase_sdk_version_string) else {
+  fatalError("Invalid Firebase SDK version: \(firebase_sdk_version_string)")
+}
+
+guard let shared_spm_version = Version("\(firebase_core_version_string)\(shared_spm_tag)") else {
+  fatalError("Invalid firebase_core version: \(firebase_core_version_string)\(shared_spm_tag)")
+}
+
+let package = Package(
+  name: "firebase_in_app_messaging",
+  platforms: [
+    .iOS("13.0"),
+  ],
+  products: [
+    .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]),
+  ],
+  dependencies: [
+    .package(url: "https://github.com/firebase/firebase-ios-sdk", from: firebase_sdk_version),
+    .package(url: "https://github.com/firebase/flutterfire", exact: shared_spm_version),
+  ],
+  targets: [
+    .target(
+      name: "firebase_in_app_messaging",
+      dependencies: [
+        .product(name: "FirebaseInAppMessaging-Beta", package: "firebase-ios-sdk"),
+        // Wrapper dependency
+        .product(name: "firebase-core-shared", package: "flutterfire"),
+      ],
+      resources: [
+        .process("Resources"),
+      ],
+      cSettings: [
+        .headerSearchPath("include"),
+        .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
+        .define("LIBRARY_NAME", to: "\"flutter-fire-fiam\""),
+      ]
+    ),
+  ]
+)

packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/Classes/FirebaseInAppMessagingPlugin.m → packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/FirebaseInAppMessagingPlugin.m

@@ -4,8 +4,13 @@
 
 #import "FirebaseInAppMessagingPlugin.h"
 
-#import <Firebase/Firebase.h>
+@import FirebaseInAppMessaging;
+
+#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
 #import <firebase_core/FLTFirebasePluginRegistry.h>
+#else
+#import <FLTFirebasePluginRegistry.h>
+#endif
 
 NSString *const kFLTFirebaseInAppMessagingChannelName =
     @"plugins.flutter.io/firebase_in_app_messaging";
@@ -53,11 +58,11 @@ - (NSDictionary *_Nonnull)pluginConstantsForFIRApp:(FIRApp *)firebase_app {
 }
 
 - (NSString *_Nonnull)firebaseLibraryName {
-  return LIBRARY_NAME;
+  return @LIBRARY_NAME;
 }
 
 - (NSString *_Nonnull)firebaseLibraryVersion {
-  return LIBRARY_VERSION;
+  return @LIBRARY_VERSION;
 }
 
 - (NSString *_Nonnull)flutterChannelName {

packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/Classes/FirebaseInAppMessagingPlugin.h → packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/include/FirebaseInAppMessagingPlugin.h

@@ -6,7 +6,12 @@
 #import <TargetConditionals.h>
 
 #import <Foundation/Foundation.h>
+
+#if __has_include(<firebase_core/FLTFirebasePlugin.h>)
 #import <firebase_core/FLTFirebasePlugin.h>
+#else
+#import <FLTFirebasePlugin.h>
+#endif
 
 @interface FirebaseInAppMessagingPlugin : FLTFirebasePlugin <FlutterPlugin, FLTFirebasePlugin>
 @end

packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/generated_firebase_sdk_version.txt

@@ -0,0 +1 @@
+11.4.0