Skip to content

Commit a6df5ac

Browse files
update sample to use new versions (#702)
1 parent 07e4a51 commit a6df5ac

File tree

9 files changed

+105
-101
lines changed

9 files changed

+105
-101
lines changed

flutter_maps_firestore/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
.pub-cache/
2727
.pub/
2828
/build/
29+
/lib/generated_plugin_registrant.dart
2930

3031
# Android related
3132
**/android/**/gradle-wrapper.jar

flutter_maps_firestore/ios/Runner/GoogleService-Info.plist renamed to flutter_maps_firestore/ios/GoogleService-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<!--
5+
<!--
66
TODO: Replace this file with credentials from Cloud Firestore.
77
See https://pub.dev/packages/cloud_firestore#setup for more detail.
88
-->

flutter_maps_firestore/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
platform :ios, '10.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

flutter_maps_firestore/ios/Podfile.lock

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -218,54 +218,53 @@ PODS:
218218
- BoringSSL-GRPC/Implementation (0.0.7):
219219
- BoringSSL-GRPC/Interface (= 0.0.7)
220220
- BoringSSL-GRPC/Interface (0.0.7)
221-
- cloud_firestore (0.14.4):
222-
- Firebase/CoreOnly (~> 6.33.0)
223-
- Firebase/Firestore (~> 6.33.0)
221+
- cloud_firestore (0.16.0):
222+
- Firebase/Firestore (= 7.3.0)
224223
- firebase_core
225224
- Flutter
226-
- Firebase/CoreOnly (6.33.0):
227-
- FirebaseCore (= 6.10.3)
228-
- Firebase/Firestore (6.33.0):
225+
- Firebase/CoreOnly (7.3.0):
226+
- FirebaseCore (= 7.3.0)
227+
- Firebase/Firestore (7.3.0):
229228
- Firebase/CoreOnly
230-
- FirebaseFirestore (~> 1.18.0)
231-
- firebase_core (0.5.3):
232-
- Firebase/CoreOnly (~> 6.33.0)
229+
- FirebaseFirestore (~> 7.3.0)
230+
- firebase_core (0.7.0):
231+
- Firebase/CoreOnly (= 7.3.0)
233232
- Flutter
234-
- FirebaseCore (6.10.3):
235-
- FirebaseCoreDiagnostics (~> 1.6)
236-
- GoogleUtilities/Environment (~> 6.7)
237-
- GoogleUtilities/Logger (~> 6.7)
238-
- FirebaseCoreDiagnostics (1.7.0):
239-
- GoogleDataTransport (~> 7.4)
240-
- GoogleUtilities/Environment (~> 6.7)
241-
- GoogleUtilities/Logger (~> 6.7)
242-
- nanopb (~> 1.30906.0)
243-
- FirebaseFirestore (1.18.0):
233+
- FirebaseCore (7.3.0):
234+
- FirebaseCoreDiagnostics (~> 7.0)
235+
- GoogleUtilities/Environment (~> 7.0)
236+
- GoogleUtilities/Logger (~> 7.0)
237+
- FirebaseCoreDiagnostics (7.3.0):
238+
- GoogleDataTransport (~> 8.0)
239+
- GoogleUtilities/Environment (~> 7.0)
240+
- GoogleUtilities/Logger (~> 7.0)
241+
- nanopb (~> 2.30906.0)
242+
- FirebaseFirestore (7.3.0):
244243
- abseil/algorithm (= 0.20200225.0)
245244
- abseil/base (= 0.20200225.0)
246245
- abseil/memory (= 0.20200225.0)
247246
- abseil/meta (= 0.20200225.0)
248247
- abseil/strings/strings (= 0.20200225.0)
249248
- abseil/time (= 0.20200225.0)
250249
- abseil/types (= 0.20200225.0)
251-
- FirebaseCore (~> 6.10)
250+
- FirebaseCore (~> 7.0)
252251
- "gRPC-C++ (~> 1.28.0)"
253252
- leveldb-library (~> 1.22)
254-
- nanopb (~> 1.30906.0)
253+
- nanopb (~> 2.30906.0)
255254
- Flutter (1.0.0)
256255
- google_maps_flutter (0.0.1):
257256
- Flutter
258257
- GoogleMaps (< 3.10)
259-
- GoogleDataTransport (7.5.1):
260-
- nanopb (~> 1.30906.0)
258+
- GoogleDataTransport (8.1.0):
259+
- nanopb (~> 2.30906.0)
261260
- GoogleMaps (3.9.0):
262261
- GoogleMaps/Maps (= 3.9.0)
263262
- GoogleMaps/Base (3.9.0)
264263
- GoogleMaps/Maps (3.9.0):
265264
- GoogleMaps/Base
266-
- GoogleUtilities/Environment (6.7.2):
265+
- GoogleUtilities/Environment (7.2.2):
267266
- PromisesObjC (~> 1.2)
268-
- GoogleUtilities/Logger (6.7.2):
267+
- GoogleUtilities/Logger (7.2.2):
269268
- GoogleUtilities/Environment
270269
- "gRPC-C++ (1.28.2)":
271270
- "gRPC-C++/Implementation (= 1.28.2)"
@@ -294,12 +293,12 @@ PODS:
294293
- leveldb-library (1.22)
295294
- location (0.0.1):
296295
- Flutter
297-
- nanopb (1.30906.0):
298-
- nanopb/decode (= 1.30906.0)
299-
- nanopb/encode (= 1.30906.0)
300-
- nanopb/decode (1.30906.0)
301-
- nanopb/encode (1.30906.0)
302-
- PromisesObjC (1.2.11)
296+
- nanopb (2.30906.0):
297+
- nanopb/decode (= 2.30906.0)
298+
- nanopb/encode (= 2.30906.0)
299+
- nanopb/decode (2.30906.0)
300+
- nanopb/encode (2.30906.0)
301+
- PromisesObjC (1.2.12)
303302

304303
DEPENDENCIES:
305304
- cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
@@ -340,24 +339,24 @@ EXTERNAL SOURCES:
340339
SPEC CHECKSUMS:
341340
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
342341
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
343-
cloud_firestore: b8c0e15fa49dfff87c2817d288b577e5dca2df13
344-
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
345-
firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
346-
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
347-
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
348-
FirebaseFirestore: adff4877869ca91a11250cc0989a6cd56bad163f
349-
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
342+
cloud_firestore: 433cf1aece50c727965355ae00e8dbeeceae66b1
343+
Firebase: 26223c695fe322633274198cb19dca8cb7e54416
344+
firebase_core: 91b27774a52f41f8b58484a75edf71197ac01c59
345+
FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
346+
FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
347+
FirebaseFirestore: 1906bf163afdb7c432d2e3b5c40ceb9dd2df5820
348+
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
350349
google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
351-
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
350+
GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
352351
GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
353-
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
352+
GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43
354353
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
355354
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
356355
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
357356
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
358-
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
359-
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
357+
nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
358+
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
360359

361-
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
360+
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
362361

363-
COCOAPODS: 1.10.0
362+
COCOAPODS: 1.10.1

flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
1CE675A625CE605000325BA9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1CE675A525CE605000325BA9 /* GoogleService-Info.plist */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
44289E58C320D2136948D8B5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 317BB7AEF21532EAB848C0A2 /* Pods_Runner.framework */; };
1314
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@@ -33,6 +34,7 @@
3334
0E34F382B0FD16B9253A17D7 /* 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>"; };
3435
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3536
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
37+
1CE675A525CE605000325BA9 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
3638
317BB7AEF21532EAB848C0A2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3739
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3840
5F06FDF21BEA74B7C8AF53D3 /* 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>"; };
@@ -83,6 +85,7 @@
8385
97C146E51CF9000F007C117D = {
8486
isa = PBXGroup;
8587
children = (
88+
1CE675A525CE605000325BA9 /* GoogleService-Info.plist */,
8689
9740EEB11CF90186004384FC /* Flutter */,
8790
97C146F01CF9000F007C117D /* Runner */,
8891
97C146EF1CF9000F007C117D /* Products */,
@@ -121,7 +124,6 @@
121124
5F06FDF21BEA74B7C8AF53D3 /* Pods-Runner.release.xcconfig */,
122125
0E34F382B0FD16B9253A17D7 /* Pods-Runner.profile.xcconfig */,
123126
);
124-
name = Pods;
125127
path = Pods;
126128
sourceTree = "<group>";
127129
};
@@ -191,6 +193,7 @@
191193
files = (
192194
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
193195
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
196+
1CE675A625CE605000325BA9 /* GoogleService-Info.plist in Resources */,
194197
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
195198
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
196199
);
@@ -380,7 +383,10 @@
380383
"$(PROJECT_DIR)/Flutter",
381384
);
382385
INFOPLIST_FILE = Runner/Info.plist;
383-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
386+
LD_RUNPATH_SEARCH_PATHS = (
387+
"$(inherited)",
388+
"@executable_path/Frameworks",
389+
);
384390
LIBRARY_SEARCH_PATHS = (
385391
"$(inherited)",
386392
"$(PROJECT_DIR)/Flutter",
@@ -493,7 +499,8 @@
493499
MTL_ENABLE_DEBUG_INFO = NO;
494500
SDKROOT = iphoneos;
495501
SUPPORTED_PLATFORMS = iphoneos;
496-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
502+
SWIFT_COMPILATION_MODE = wholemodule;
503+
SWIFT_OPTIMIZATION_LEVEL = "-O";
497504
TARGETED_DEVICE_FAMILY = "1,2";
498505
VALIDATE_PRODUCT = YES;
499506
};
@@ -512,7 +519,10 @@
512519
"$(PROJECT_DIR)/Flutter",
513520
);
514521
INFOPLIST_FILE = Runner/Info.plist;
515-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
522+
LD_RUNPATH_SEARCH_PATHS = (
523+
"$(inherited)",
524+
"@executable_path/Frameworks",
525+
);
516526
LIBRARY_SEARCH_PATHS = (
517527
"$(inherited)",
518528
"$(PROJECT_DIR)/Flutter",
@@ -539,7 +549,10 @@
539549
"$(PROJECT_DIR)/Flutter",
540550
);
541551
INFOPLIST_FILE = Runner/Info.plist;
542-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
552+
LD_RUNPATH_SEARCH_PATHS = (
553+
"$(inherited)",
554+
"@executable_path/Frameworks",
555+
);
543556
LIBRARY_SEARCH_PATHS = (
544557
"$(inherited)",
545558
"$(PROJECT_DIR)/Flutter",

flutter_maps_firestore/lib/generated_plugin_registrant.dart

Lines changed: 0 additions & 15 deletions
This file was deleted.

flutter_maps_firestore/lib/main.dart

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// found in the LICENSE file.
44

55
import 'dart:async';
6+
import 'package:firebase_core/firebase_core.dart';
67
import 'package:flutter/material.dart';
78
import 'package:cloud_firestore/cloud_firestore.dart';
89
import 'package:google_maps_flutter/google_maps_flutter.dart';
@@ -16,7 +17,11 @@ const _pinkHue = 350.0;
1617
// Places API client used for Place Photos
1718
final _placesApiClient = GoogleMapsPlaces(apiKey: googleMapsApiKey);
1819

19-
void main() => runApp(App());
20+
Future<void> main() async {
21+
WidgetsFlutterBinding.ensureInitialized();
22+
await Firebase.initializeApp();
23+
runApp(App());
24+
}
2025

2126
class App extends StatelessWidget {
2227
@override

0 commit comments

Comments
 (0)