-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[google_maps_flutter] Add iOS SDK 9.x support (#6902)
Expands the range of supported versions of the iOS Google Maps SDK to include 9.x. To ensure build compatibility coverage, this follows the previously-established model of making duplicate example apps with different min iOS versions, but without most of the tests (as described in example/README.md). The new `ios15` example directory is a duplicate of `ios14/` with: - The min project and Podfile versions upped to 15.0 (I've validated locally that this causes a build to get 9.0 of the SDK). - The integration tests and XCUITest are removed. - All but the main plugin XCTest tests are removed (that file is left mainly as a placeholder to add new unit tests if necessary). This does not remove the privacy manifest workaround for 8.4, as we still support 8.4; the resulting duplication should be harmless for now. See discussion in flutter/flutter#146838. Fixes flutter/flutter#149873
- Loading branch information
1 parent
f116dd2
commit 04d2572
Showing
51 changed files
with
1,628 additions
and
2 deletions.
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Platform Implementation Test App | ||
|
||
This is a test app for manual testing and automated integration testing | ||
of this platform implementation. It is not intended to demonstrate actual use of | ||
this package, since the intent is that plugin clients use the app-facing | ||
package. | ||
|
||
Unless you are making changes to this implementation package, this example is | ||
very unlikely to be relevant. | ||
|
||
## Versions | ||
|
||
This example requires iOS 15, so will select a 9.x GoogleMaps SDK version. |
Binary file added
BIN
+304 Bytes
...e_maps_flutter/google_maps_flutter_ios/example/ios15/assets/2.0x/red_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+312 Bytes
...e_maps_flutter/google_maps_flutter_ios/example/ios15/assets/3.0x/red_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
162 changes: 162 additions & 0 deletions
162
packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/assets/night_mode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
[ | ||
{ | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#242f3e" | ||
} | ||
] | ||
}, | ||
{ | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#746855" | ||
} | ||
] | ||
}, | ||
{ | ||
"elementType": "labels.text.stroke", | ||
"stylers": [ | ||
{ | ||
"color": "#242f3e" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "administrative.locality", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#d59563" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "poi", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#d59563" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "poi.park", | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#263c3f" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "poi.park", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#6b9a76" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road", | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#38414e" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road", | ||
"elementType": "geometry.stroke", | ||
"stylers": [ | ||
{ | ||
"color": "#212a37" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#9ca5b3" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road.highway", | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#746855" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road.highway", | ||
"elementType": "geometry.stroke", | ||
"stylers": [ | ||
{ | ||
"color": "#1f2835" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "road.highway", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#f3d19c" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "transit", | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#2f3948" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "transit.station", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#d59563" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "water", | ||
"elementType": "geometry", | ||
"stylers": [ | ||
{ | ||
"color": "#17263c" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "water", | ||
"elementType": "labels.text.fill", | ||
"stylers": [ | ||
{ | ||
"color": "#515c6d" | ||
} | ||
] | ||
}, | ||
{ | ||
"featureType": "water", | ||
"elementType": "labels.text.stroke", | ||
"stylers": [ | ||
{ | ||
"color": "#17263c" | ||
} | ||
] | ||
} | ||
] | ||
|
Binary file added
BIN
+195 Bytes
...google_maps_flutter/google_maps_flutter_ios/example/ios15/assets/red_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions
30
...gle_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Flutter/AppFrameworkInfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>CFBundleDevelopmentRegion</key> | ||
<string>en</string> | ||
<key>CFBundleExecutable</key> | ||
<string>App</string> | ||
<key>CFBundleIdentifier</key> | ||
<string>io.flutter.flutter.app</string> | ||
<key>CFBundleInfoDictionaryVersion</key> | ||
<string>6.0</string> | ||
<key>CFBundleName</key> | ||
<string>App</string> | ||
<key>CFBundlePackageType</key> | ||
<string>FMWK</string> | ||
<key>CFBundleShortVersionString</key> | ||
<string>1.0</string> | ||
<key>CFBundleSignature</key> | ||
<string>????</string> | ||
<key>CFBundleVersion</key> | ||
<string>1.0</string> | ||
<key>UIRequiredDeviceCapabilities</key> | ||
<array> | ||
<string>arm64</string> | ||
</array> | ||
<key>MinimumOSVersion</key> | ||
<string>12.0</string> | ||
</dict> | ||
</plist> |
2 changes: 2 additions & 0 deletions
2
...ages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Flutter/Debug.xcconfig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" | ||
#include "Generated.xcconfig" |
2 changes: 2 additions & 0 deletions
2
...es/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Flutter/Release.xcconfig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" | ||
#include "Generated.xcconfig" |
43 changes: 43 additions & 0 deletions
43
packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Uncomment this line to define a global platform for your project | ||
platform :ios, '15.0' | ||
|
||
# CocoaPods analytics sends network stats synchronously affecting flutter build latency. | ||
ENV['COCOAPODS_DISABLE_STATS'] = 'true' | ||
|
||
project 'Runner', { | ||
'Debug' => :debug, | ||
'Profile' => :release, | ||
'Release' => :release, | ||
} | ||
|
||
def flutter_root | ||
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) | ||
unless File.exist?(generated_xcode_build_settings_path) | ||
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" | ||
end | ||
|
||
File.foreach(generated_xcode_build_settings_path) do |line| | ||
matches = line.match(/FLUTTER_ROOT\=(.*)/) | ||
return matches[1].strip if matches | ||
end | ||
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" | ||
end | ||
|
||
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) | ||
|
||
flutter_ios_podfile_setup | ||
|
||
target 'Runner' do | ||
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) | ||
target 'RunnerTests' do | ||
inherit! :search_paths | ||
|
||
pod 'OCMock', '~> 3.9.1' | ||
end | ||
end | ||
|
||
post_install do |installer| | ||
installer.pods_project.targets.each do |target| | ||
flutter_additional_ios_build_settings(target) | ||
end | ||
end |
Oops, something went wrong.