Merge branch 'main' of https://github.com/flutter/samples into beta

flutter · Aug 9, 2023 · bd81220 · bd81220
2 parents bbd83bb + 286b5ca
commit bd81220
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/google_maps/.metadata b/google_maps/.metadata
@@ -4,26 +4,20 @@
 # This file should be version controlled.
 
 version:
-  revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-  channel: beta
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+  channel: stable
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-      base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-    - platform: android
-      create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-      base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-    - platform: ios
-      create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-      base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: web
-      create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
-      base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
 
   # User provided section
 

diff --git a/google_maps/README.md b/google_maps/README.md
@@ -0,0 +1,9 @@
+# Google Maps Demo
+
+This sample Flutter app showcases the [Google Maps for Flutter plugin](https://developers.google.com/maps/flutter-plugin/overview).
+
+## Getting Started
+
+1. See the overview at https://developers.google.com/maps/flutter-plugin/overview.
+1. Follow the setup guide at https://developers.google.com/maps/flutter-plugin/config to learn where to insert your API keys. This demo will not run without API keys added.
+1. Use the sample code in this folder for the tutorial at https://developers.google.com/maps/flutter-plugin/map-with-marker.
diff --git a/google_maps/android/app/build.gradle b/google_maps/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
         applicationId "com.example.google_maps_in_flutter"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 20
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/google_maps/ios/Podfile b/google_maps/ios/Podfile
@@ -1,5 +1,5 @@
-#  Google Maps SDK requires platform version 13
-platform :ios, '13.0'
+#  Google Maps SDK requires platform version 14
+platform :ios, '14.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/google_maps/lib/main.dart b/google_maps/lib/main.dart
@@ -56,6 +56,10 @@ class _MyAppState extends State<MyApp> {
             const Marker(
               markerId: MarkerId('Sydney'),
               position: LatLng(-33.86, 151.20),
+              infoWindow: InfoWindow(
+                title: "Sydney",
+                snippet: "Capital of New South Wales",
+              ),
             )
           },
         ),

diff --git a/google_maps/pubspec.yaml b/google_maps/pubspec.yaml
@@ -10,8 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.2
-  google_maps_flutter: ^2.2.1
-  google_maps_flutter_web: ^0.5.0
+  google_maps_flutter: ^2.4.0
   http: ^1.0.0
   json_annotation: ^4.7.0
   json_serializable: ^6.5.4