From c7f9e47521f7cb0a66d02c78a390d3e34488fc17 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 11 Aug 2020 11:58:25 -0700 Subject: [PATCH 1/6] Attempting to get all ipas to pass --- .../google_maps_flutter/ios/google_maps_flutter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index 9a1f04d59759..6069b6639ae3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -17,7 +17,7 @@ Downloaded by pub (not CocoaPods). s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'GoogleMaps' + s.dependency 'GoogleMaps', '~> 2.7' s.static_framework = true s.platform = :ios, '8.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } From 68db59d8e2163c1ed14c81b164ea34708f051107 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 11 Aug 2020 12:08:19 -0700 Subject: [PATCH 2/6] Bump versions all around. --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 4 ++++ .../google_maps_flutter/ios/google_maps_flutter.podspec | 2 +- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 5d62a5179fd4..fbab7f22c4bd 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.29+1 + +* (ios) Pin dependency on GoogleMaps pod to `~>2.7`, to address https://github.com/flutter/flutter/issues/63447 + ## 0.5.29 * Pass a constant `_web_only_mapCreationId` to `platform.buildView`, so web can return a cached widget DOM when flutter attempts to repaint there. diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index 6069b6639ae3..2710aed12dfb 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -3,7 +3,7 @@ # Pod::Spec.new do |s| s.name = 'google_maps_flutter' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'Google Maps for Flutter' s.description = <<-DESC A Flutter plugin that provides a Google Maps widget. diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 120600a9823c..a33efb9d8e2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter -version: 0.5.29 +version: 0.5.29+1 dependencies: flutter: From 83122a1d0af998a402e8b8696fd5d8487a3c5246 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 11 Aug 2020 13:29:25 -0700 Subject: [PATCH 3/6] Pin to last known good version. --- .../google_maps_flutter/ios/google_maps_flutter.podspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index 2710aed12dfb..8358e174f1fe 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -17,7 +17,8 @@ Downloaded by pub (not CocoaPods). s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'GoogleMaps', '~> 2.7' + # TODO: Unpin this once the fix for b/163474612 or b/163359804 rolls (avoid v3.10!) + s.dependency 'GoogleMaps', '3.9' s.static_framework = true s.platform = :ios, '8.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } From b0a7eaf7ae999f1b29a136bdaabc5deae7c55319 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 11 Aug 2020 14:11:06 -0700 Subject: [PATCH 4/6] Avoid 3.10 --- .../google_maps_flutter/ios/google_maps_flutter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index 8358e174f1fe..e182e1e56b6b 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -18,7 +18,7 @@ Downloaded by pub (not CocoaPods). s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' # TODO: Unpin this once the fix for b/163474612 or b/163359804 rolls (avoid v3.10!) - s.dependency 'GoogleMaps', '3.9' + s.dependency 'GoogleMaps', '< 3.10' s.static_framework = true s.platform = :ios, '8.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } From a0e309887f8d860f5f83388e5197075a5b14a3e4 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 11 Aug 2020 14:12:30 -0700 Subject: [PATCH 5/6] Don't lie in the CHANGELOG --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index fbab7f22c4bd..d26663fe9ccb 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.5.29+1 -* (ios) Pin dependency on GoogleMaps pod to `~>2.7`, to address https://github.com/flutter/flutter/issues/63447 +* (ios) Pin dependency on GoogleMaps pod to `< 3.10`, to address https://github.com/flutter/flutter/issues/63447 ## 0.5.29 From 916984083cc823033d46aea2b6e8a5d7007fa898 Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Tue, 11 Aug 2020 16:23:44 -0700 Subject: [PATCH 6/6] Do not edit podspec version Pub handles that for us --- .../google_maps_flutter/ios/google_maps_flutter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index e182e1e56b6b..021abfee71ab 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -3,7 +3,7 @@ # Pod::Spec.new do |s| s.name = 'google_maps_flutter' - s.version = '0.0.2' + s.version = '0.0.1' s.summary = 'Google Maps for Flutter' s.description = <<-DESC A Flutter plugin that provides a Google Maps widget.