From 31c22271fd1469962c87287006e63c24b03d4356 Mon Sep 17 00:00:00 2001 From: August Date: Tue, 18 Feb 2025 13:46:22 +0100 Subject: [PATCH 1/2] fix: Check for Pods/FirebaseCrashlytics directory when using SPM and Pods simultaneously --- .../flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart b/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart index 6df1f333..d997196e 100644 --- a/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart +++ b/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart @@ -392,7 +392,7 @@ bashScript = %q( #!/bin/bash PATH="\${PATH}:\$FLUTTER_ROOT/bin:\$HOME/.pub-cache/bin" -if [ -z "\$PODS_ROOT" ]; then +if [ -z "$PODS_ROOT" ] || [ ! -d "$PODS_ROOT/FirebaseCrashlytics" ]; then # Cannot use "BUILD_DIR%/Build/*" as per Firebase documentation, it points to "flutter-project/build/ios/*" path which doesn't have run script DERIVED_DATA_PATH=\$(echo "\$BUILD_ROOT" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|') PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT="\${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run" From f64942f55cb8c8b84a7801f4d088adaaaf3ccfaf Mon Sep 17 00:00:00 2001 From: August Date: Tue, 18 Feb 2025 13:48:58 +0100 Subject: [PATCH 2/2] Update firebase_apple_writes.dart readd escape char --- .../flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart b/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart index d997196e..ec3914cf 100644 --- a/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart +++ b/packages/flutterfire_cli/lib/src/firebase/firebase_apple_writes.dart @@ -392,7 +392,7 @@ bashScript = %q( #!/bin/bash PATH="\${PATH}:\$FLUTTER_ROOT/bin:\$HOME/.pub-cache/bin" -if [ -z "$PODS_ROOT" ] || [ ! -d "$PODS_ROOT/FirebaseCrashlytics" ]; then +if [ -z "\$PODS_ROOT" ] || [ ! -d "\$PODS_ROOT/FirebaseCrashlytics" ]; then # Cannot use "BUILD_DIR%/Build/*" as per Firebase documentation, it points to "flutter-project/build/ios/*" path which doesn't have run script DERIVED_DATA_PATH=\$(echo "\$BUILD_ROOT" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|') PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT="\${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run"