Fix for UserAgent.h issues

kyuqw · Mar 13, 2020 · 4d7b2bd · 4d7b2bd
1 parent 046c4d1
commit 4d7b2bd
Show file tree

Hide file tree

Showing 42 changed files with 224 additions and 118 deletions.
diff --git 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
diff --git 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
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #import "FLTCloudFirestorePlugin.h"
-#import "UserAgent.h"
 
 #import <Firebase/Firebase.h>
 

diff --git 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
@@ -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
@@ -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/...irestore/cloud_firestore_platform_interface/test/method_channel_cloud_firestore_test.dart b/...irestore/cloud_firestore_platform_interface/test/method_channel_cloud_firestore_test.dart
@@ -1028,7 +1028,6 @@ void main() {
                       'data': kMockDocumentSnapshotData,
                     },
                   },
-                  'source': 'default',
                 },
               ),
               isMethodCall(
@@ -1052,7 +1051,6 @@ void main() {
                       'data': kMockDocumentSnapshotData,
                     },
                   },
-                  'source': 'default',
                 },
               ),
             ],

diff --git a/packages/cloud_functions/cloud_functions/.gitignore b/packages/cloud_functions/cloud_functions/.gitignore
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+		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 = "<group>"; };
+		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 = "<group>"; };
 		B550B1FD23F53792007DADD5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		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 = "<group>"; };
 		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 = "<group>";
+		};
 		33BA886A226E78AF003329D5 /* Configs */ = {
 			isa = PBXGroup;
 			children = (
@@ -111,6 +128,7 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
+				20D0F4B2FDA2F55D0E4D3C97 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -163,6 +181,7 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				2EDA759B4F18DE63DF0790FB /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -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/...cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/...cloud_functions/cloud_functions/example/macos/Runner.xcworkspace/contents.xcworkspacedata
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -4,7 +4,6 @@
 #include <TargetConditionals.h>
 
 #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
@@ -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
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
		#include "ephemeral/Flutter-Generated.xcconfig"