diff --git a/.gitignore b/.gitignore index 27c8ac4ef63c..13f2ee42d53e 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,9 @@ gradle-wrapper.jar GeneratedPluginRegistrant.h GeneratedPluginRegistrant.m GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +generated_plugin_registrant.dart + build/ .flutter-plugins .flutter-plugins-dependencies diff --git a/packages/cloud_firestore/cloud_firestore/.gitignore b/packages/cloud_firestore/cloud_firestore/.gitignore deleted file mode 100644 index dd1148532910..000000000000 --- a/packages/cloud_firestore/cloud_firestore/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -ios/Classes/UserAgent.h -.flutter-plugins-dependencies -generated_plugin_registrant.dart diff --git a/packages/cloud_firestore/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/cloud_firestore/CHANGELOG.md index 7131826a5b9d..7e635a8606ce 100644 --- a/packages/cloud_firestore/cloud_firestore/CHANGELOG.md +++ b/packages/cloud_firestore/cloud_firestore/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.13.4+2 + +* Fix for missing UserAgent.h compilation failures. + ## 0.13.4+1 * Fix crash with pagination with `DocumentReference` (#2044) @@ -54,7 +58,7 @@ ## 0.13.0 -* **Breaking change** Remove use of [deprecated](https://firebase.google.com/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder.html#setTimestampsInSnapshotsEnabled(boolean)) +* **Breaking change** Remove use of [deprecated](https://firebase.google.com/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder.html#setTimestampsInSnapshotsEnabled(boolean)) setting `setTimestampsInSnapshotsEnabled`. If you are already setting it to true, just remove the setting. If you are setting it to false, you should update your code to expect Timestamps. diff --git a/packages/cloud_firestore/cloud_firestore/darwin/Classes/FLTCloudFirestorePlugin.m b/packages/cloud_firestore/cloud_firestore/darwin/Classes/FLTCloudFirestorePlugin.m index adfffe241bd5..b07700bfb218 100644 --- a/packages/cloud_firestore/cloud_firestore/darwin/Classes/FLTCloudFirestorePlugin.m +++ b/packages/cloud_firestore/cloud_firestore/darwin/Classes/FLTCloudFirestorePlugin.m @@ -3,7 +3,6 @@ // found in the LICENSE file. #import "FLTCloudFirestorePlugin.h" -#import "UserAgent.h" #import diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec index 8b4f4e8b917d..dbb4238bbbec 100755 --- a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec +++ b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec @@ -24,9 +24,5 @@ Firestore plugin for Flutter. s.dependency 'Firebase/Firestore', '~> 6.0' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-fst\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fst\\\"" } end diff --git a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore.podspec b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore.podspec index f7dafd56f0a5..557cbacf567d 100755 --- a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore.podspec +++ b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore.podspec @@ -24,9 +24,5 @@ Firestore plugin for Flutter. s.dependency 'Firebase/Firestore', '~> 6.0' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-fst\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fst\\\"" } end diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index 6560518ee6c0..55115d9a9c81 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database with live synchronization and offline support on Android and iOS. homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore/cloud_firestore -version: 0.13.4+1 +version: 0.13.4+2 flutter: plugin: diff --git a/packages/cloud_functions/cloud_functions/.gitignore b/packages/cloud_functions/cloud_functions/.gitignore deleted file mode 100644 index e63fb2b15019..000000000000 --- a/packages/cloud_functions/cloud_functions/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -.DS_Store -.atom/ -.idea/ -.vscode/ - -.packages -.pub/ -.dart_tool/ -pubspec.lock - -Podfile -Podfile.lock -Pods/ -.symlinks/ -**/Flutter/App.framework/ -**/Flutter/Flutter.framework/ -**/Flutter/Generated.xcconfig -**/Flutter/flutter_assets/ -ServiceDefinitions.json -xcuserdata/ - -local.properties -.gradle/ -gradlew -gradlew.bat -gradle-wrapper.jar -*.iml - -GeneratedPluginRegistrant.h -GeneratedPluginRegistrant.m -GeneratedPluginRegistrant.java -build/ -.flutter-plugins - -ios/Classes/UserAgent.h - -.flutter-plugins-dependencies - diff --git a/packages/cloud_functions/cloud_functions/CHANGELOG.md b/packages/cloud_functions/cloud_functions/CHANGELOG.md index 3d3efa5b385f..c457b7802075 100644 --- a/packages/cloud_functions/cloud_functions/CHANGELOG.md +++ b/packages/cloud_functions/cloud_functions/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.2+3 + +* Fix for missing UserAgent.h compilation failures. + ## 0.4.2+2 * Fix method channel on darwin diff --git a/packages/cloud_functions/cloud_functions/darwin/Classes/CloudFunctionsPlugin.m b/packages/cloud_functions/cloud_functions/darwin/Classes/CloudFunctionsPlugin.m index 95382984494b..d39b8813ba36 100644 --- a/packages/cloud_functions/cloud_functions/darwin/Classes/CloudFunctionsPlugin.m +++ b/packages/cloud_functions/cloud_functions/darwin/Classes/CloudFunctionsPlugin.m @@ -3,7 +3,6 @@ // found in the LICENSE file. #import "CloudFunctionsPlugin.h" -#import "UserAgent.h" #import "Firebase/Firebase.h" diff --git a/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b608ba..785633d3a86b 100644 --- a/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Debug.xcconfig +++ b/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Release.xcconfig b/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Release.xcconfig index c2efd0b608ba..5fba960c3af2 100644 --- a/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Release.xcconfig +++ b/packages/cloud_functions/cloud_functions/example/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/cloud_functions/cloud_functions/example/macos/Runner.xcodeproj/project.pbxproj b/packages/cloud_functions/cloud_functions/example/macos/Runner.xcodeproj/project.pbxproj index 8469940761c2..398cd94abbca 100644 --- a/packages/cloud_functions/cloud_functions/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/cloud_functions/cloud_functions/example/macos/Runner.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ B550B1FE23F53792007DADD5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B550B1FD23F53792007DADD5 /* GoogleService-Info.plist */; }; D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + E1A3C0FEB219DE3059F49DD9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EDA759B4F18DE63DF0790FB /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -59,6 +60,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 2EDA759B4F18DE63DF0790FB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -76,7 +78,10 @@ 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + 9BC7A999E9028F67221E5E4C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + B51643519054BD100F273F38 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; B550B1FD23F53792007DADD5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + D71BFD332DFDD49FEC2851C7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -87,12 +92,24 @@ files = ( D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, + E1A3C0FEB219DE3059F49DD9 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 20D0F4B2FDA2F55D0E4D3C97 /* Pods */ = { + isa = PBXGroup; + children = ( + D71BFD332DFDD49FEC2851C7 /* Pods-Runner.debug.xcconfig */, + B51643519054BD100F273F38 /* Pods-Runner.release.xcconfig */, + 9BC7A999E9028F67221E5E4C /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -111,6 +128,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, + 20D0F4B2FDA2F55D0E4D3C97 /* Pods */, ); sourceTree = ""; }; @@ -163,6 +181,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( + 2EDA759B4F18DE63DF0790FB /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -174,11 +193,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + EAC7B8DAC277B926B74FC7DF /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, + CBEB00393727ABD0F646D64D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -286,6 +307,43 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; }; + CBEB00393727ABD0F646D64D /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + EAC7B8DAC277B926B74FC7DF /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/packages/cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a16ed0f..21a3cc14c74e 100644 --- a/packages/cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec b/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec index 7ff410257bbe..4102ce7ef766 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec @@ -25,10 +25,6 @@ A new flutter plugin project. s.dependency 'Firebase/Functions', '~> 6.0' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-fn\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fn\\\"" } end diff --git a/packages/cloud_functions/cloud_functions/macos/cloud_functions.podspec b/packages/cloud_functions/cloud_functions/macos/cloud_functions.podspec index 90c68fd45670..1a4750a6116f 100644 --- a/packages/cloud_functions/cloud_functions/macos/cloud_functions.podspec +++ b/packages/cloud_functions/cloud_functions/macos/cloud_functions.podspec @@ -25,10 +25,6 @@ A new flutter plugin project. s.dependency 'Firebase/Functions', '~> 6.0' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-fn\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fn\\\"" } end diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index d1fbd50ec4be..94911dd3888e 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -1,6 +1,6 @@ name: cloud_functions description: Flutter plugin for Cloud Functions. -version: 0.4.2+2 +version: 0.4.2+3 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_functions/cloud_functions flutter: diff --git a/packages/firebase_auth/firebase_auth/.gitignore b/packages/firebase_auth/firebase_auth/.gitignore deleted file mode 100644 index 46385dab97b6..000000000000 --- a/packages/firebase_auth/firebase_auth/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ios/Classes/UserAgent.h diff --git a/packages/firebase_auth/firebase_auth/CHANGELOG.md b/packages/firebase_auth/firebase_auth/CHANGELOG.md index 7b3b7c079183..ffc4c60e1007 100644 --- a/packages/firebase_auth/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/firebase_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.15.5+3 + +* Fix for missing UserAgent.h compilation failures. + ## 0.15.5+2 * Update the platform interface dependency to 1.1.7 and update tests. diff --git a/packages/firebase_auth/firebase_auth/darwin/Classes/FLTFirebaseAuthPlugin.m b/packages/firebase_auth/firebase_auth/darwin/Classes/FLTFirebaseAuthPlugin.m index 16e35a5db597..899f079e07cf 100644 --- a/packages/firebase_auth/firebase_auth/darwin/Classes/FLTFirebaseAuthPlugin.m +++ b/packages/firebase_auth/firebase_auth/darwin/Classes/FLTFirebaseAuthPlugin.m @@ -4,7 +4,6 @@ #include #import "FLTFirebaseAuthPlugin.h" -#import "UserAgent.h" #import "Firebase/Firebase.h" diff --git a/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b608ba..785633d3a86b 100644 --- a/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Debug.xcconfig +++ b/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Release.xcconfig b/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Release.xcconfig index c2efd0b608ba..5fba960c3af2 100644 --- a/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Release.xcconfig +++ b/packages/firebase_auth/firebase_auth/example/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/project.pbxproj b/packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/project.pbxproj index 3e4a0aa34595..c71d67fe54fb 100644 --- a/packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B550B1FC23F53648007DADD5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B550B1FB23F53648007DADD5 /* GoogleService-Info.plist */; }; + B6036D992F5B77F0D48D7883 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1026236A547BC5196614E954 /* Pods_Runner.framework */; }; D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ @@ -59,6 +60,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0B4CF9B1CA3F6E07FE2F953C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 1026236A547BC5196614E954 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1E5E064344044E24673A33BD /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -74,6 +78,7 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 3D7BD4B06D0869EA1407E048 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; B550B1FB23F53648007DADD5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -87,12 +92,24 @@ files = ( D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, + B6036D992F5B77F0D48D7883 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 286E7513A68DD39907D77423 /* Pods */ = { + isa = PBXGroup; + children = ( + 3D7BD4B06D0869EA1407E048 /* Pods-Runner.debug.xcconfig */, + 1E5E064344044E24673A33BD /* Pods-Runner.release.xcconfig */, + 0B4CF9B1CA3F6E07FE2F953C /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -111,6 +128,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, + 286E7513A68DD39907D77423 /* Pods */, ); sourceTree = ""; }; @@ -163,6 +181,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( + 1026236A547BC5196614E954 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -174,11 +193,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 9C4FABD4FD7B8936CFFEAF31 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, + E033F9E34514FF7F419D8FF5 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -286,6 +307,43 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; }; + 9C4FABD4FD7B8936CFFEAF31 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + E033F9E34514FF7F419D8FF5 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/packages/firebase_auth/firebase_auth/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/firebase_auth/firebase_auth/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a16ed0f..21a3cc14c74e 100644 --- a/packages/firebase_auth/firebase_auth/example/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/firebase_auth/firebase_auth/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec index 2b818ef49fc2..98ac049441de 100755 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec @@ -25,9 +25,5 @@ Firebase Auth plugin for Flutter. s.dependency 'Firebase/Core' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-auth\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-auth\\\"" } end diff --git a/packages/firebase_auth/firebase_auth/macos/firebase_auth.podspec b/packages/firebase_auth/firebase_auth/macos/firebase_auth.podspec index 3830e6eb4720..4c8f989c40e9 100755 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth.podspec +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth.podspec @@ -25,9 +25,5 @@ Firebase Auth plugin for Flutter. s.dependency 'Firebase/Core' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-auth\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-auth\\\"" } end diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index 429bfd455c25..8417533a70fc 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS authentication using passwords, phone numbers and identity providers like Google, Facebook and Twitter. homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_auth/firebase_auth -version: 0.15.5+2 +version: 0.15.5+3 flutter: plugin: diff --git a/packages/firebase_core/firebase_core/.gitignore b/packages/firebase_core/firebase_core/.gitignore deleted file mode 100644 index 46385dab97b6..000000000000 --- a/packages/firebase_core/firebase_core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ios/Classes/UserAgent.h diff --git a/packages/firebase_core/firebase_core/CHANGELOG.md b/packages/firebase_core/firebase_core/CHANGELOG.md index b953d73aaddc..cd77c03aa7d4 100644 --- a/packages/firebase_core/firebase_core/CHANGELOG.md +++ b/packages/firebase_core/firebase_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.4+3 + +* Fix for missing UserAgent.h compilation failures. + ## 0.4.4+2 * Update dependency on firebase_core_platform_interface to 1.0.4. diff --git a/packages/firebase_core/firebase_core/darwin/Classes/FLTFirebaseCorePlugin.m b/packages/firebase_core/firebase_core/darwin/Classes/FLTFirebaseCorePlugin.m index b41b597589e0..4b7ee117e5b9 100644 --- a/packages/firebase_core/firebase_core/darwin/Classes/FLTFirebaseCorePlugin.m +++ b/packages/firebase_core/firebase_core/darwin/Classes/FLTFirebaseCorePlugin.m @@ -3,7 +3,6 @@ // found in the LICENSE file. #import "FLTFirebaseCorePlugin.h" -#import "UserAgent.h" #import diff --git a/packages/firebase_core/firebase_core/ios/firebase_core.podspec b/packages/firebase_core/firebase_core/ios/firebase_core.podspec index 9454fb541be8..8625688875c1 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core.podspec +++ b/packages/firebase_core/firebase_core/ios/firebase_core.podspec @@ -24,9 +24,5 @@ A new flutter plugin project. s.ios.deployment_target = '8.0' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-core\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-core\\\"" } end diff --git a/packages/firebase_core/firebase_core/macos/firebase_core.podspec b/packages/firebase_core/firebase_core/macos/firebase_core.podspec index 7aa707b085bd..61f1413e0e24 100644 --- a/packages/firebase_core/firebase_core/macos/firebase_core.podspec +++ b/packages/firebase_core/firebase_core/macos/firebase_core.podspec @@ -24,9 +24,5 @@ A new flutter plugin project. s.platform = :osx, '10.11' s.static_framework = true - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-core\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-core\\\"" } end diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index 59e5f965e989..4cc82fa6c269 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_core description: Flutter plugin for Firebase Core, enabling connecting to multiple Firebase apps. homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_core/firebase_core -version: 0.4.4+2 +version: 0.4.4+3 flutter: plugin: diff --git a/packages/firebase_crashlytics/.gitignore b/packages/firebase_crashlytics/.gitignore deleted file mode 100644 index 2ece5a414cb5..000000000000 --- a/packages/firebase_crashlytics/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -.DS_Store -.dart_tool/ - -.packages -.pub/ -pubspec.lock - -build/ - -ios/Classes/UserAgent.h - diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md index 9df4475ad372..f358e8835de4 100644 --- a/packages/firebase_crashlytics/CHANGELOG.md +++ b/packages/firebase_crashlytics/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.3+3 + +* Fix for missing UserAgent.h compilation failures. + ## 0.1.3+2 * Fix Cirrus build by removing WorkspaceSettings.xcsettings file in the iOS example app. diff --git a/packages/firebase_crashlytics/darwin/Classes/FirebaseCrashlyticsPlugin.m b/packages/firebase_crashlytics/darwin/Classes/FirebaseCrashlyticsPlugin.m index 889b879745c7..607f4def8f02 100644 --- a/packages/firebase_crashlytics/darwin/Classes/FirebaseCrashlyticsPlugin.m +++ b/packages/firebase_crashlytics/darwin/Classes/FirebaseCrashlyticsPlugin.m @@ -3,7 +3,6 @@ // found in the LICENSE file. #import "FirebaseCrashlyticsPlugin.h" -#import "UserAgent.h" #import diff --git a/packages/firebase_crashlytics/example/macos/Runner.xcodeproj/project.pbxproj b/packages/firebase_crashlytics/example/macos/Runner.xcodeproj/project.pbxproj index ffda786767be..f065be57fa18 100644 --- a/packages/firebase_crashlytics/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/firebase_crashlytics/example/macos/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + A778181074198B5AB83282EB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6342CA55BF53810F97AF20C /* Pods_Runner.framework */; }; B5515A0723F6830A00F4A798 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B5515A0623F6830A00F4A798 /* GoogleService-Info.plist */; }; D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -74,10 +75,14 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 569624C19DCFE29B888EF618 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + AD1C0B47B3CC4549F903FB8C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; B5515A0623F6830A00F4A798 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + D6342CA55BF53810F97AF20C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; + F66FF69A43A7D1A9235BA2DA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -87,12 +92,24 @@ files = ( D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, + A778181074198B5AB83282EB /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1F66EACC943169C3E49C1DC4 /* Pods */ = { + isa = PBXGroup; + children = ( + F66FF69A43A7D1A9235BA2DA /* Pods-Runner.debug.xcconfig */, + AD1C0B47B3CC4549F903FB8C /* Pods-Runner.release.xcconfig */, + 569624C19DCFE29B888EF618 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -111,6 +128,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, + 1F66EACC943169C3E49C1DC4 /* Pods */, ); sourceTree = ""; }; @@ -163,6 +181,7 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( + D6342CA55BF53810F97AF20C /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -174,11 +193,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 58870CAFEA2F85D5904D2D70 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, + DEA75D176E954FABC6FEB536 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -286,6 +307,43 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; }; + 58870CAFEA2F85D5904D2D70 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + DEA75D176E954FABC6FEB536 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec index b611165b73d8..eb42d90940ad 100644 --- a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec +++ b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec @@ -26,9 +26,5 @@ A new flutter plugin project. s.dependency 'Crashlytics' s.dependency 'Firebase/Core' - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-cls\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-cls\\\"" } end diff --git a/packages/firebase_crashlytics/macos/firebase_crashlytics.podspec b/packages/firebase_crashlytics/macos/firebase_crashlytics.podspec index 64b01d7a0d4a..83eb735d7e80 100644 --- a/packages/firebase_crashlytics/macos/firebase_crashlytics.podspec +++ b/packages/firebase_crashlytics/macos/firebase_crashlytics.podspec @@ -26,9 +26,5 @@ A new flutter plugin project. s.dependency 'Crashlytics' s.dependency 'Firebase/Core' - s.prepare_command = <<-CMD - echo // Generated file, do not edit > Classes/UserAgent.h - echo "#define LIBRARY_VERSION @\\"#{libraryVersion}\\"" >> Classes/UserAgent.h - echo "#define LIBRARY_NAME @\\"flutter-fire-cls\\"" >> Classes/UserAgent.h - CMD + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{libraryVersion}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-cls\\\"" } end diff --git a/script/lint_darwin_plugins.sh b/script/lint_darwin_plugins.sh index 7e749707128c..58c8f96d8373 100755 --- a/script/lint_darwin_plugins.sh +++ b/script/lint_darwin_plugins.sh @@ -36,7 +36,7 @@ function lint_package() { "${podspec}" --allow-warnings --fail-fast - --silent + --verbose ) if [[ ! "${skip_analysis_packages[*]}" =~ "${podspecBasename}" ]]; then lint_args+=(--analyze)