Skip to content

Update master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
otopba merged 2 commits into from
Sep 20, 2019
Merged

Update master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3972c5d
Fix iOS MyLocationButton on iOS (#2068)
felangel Sep 19, 2019
a2b5a77
[instrumentation_adapter] Migrate example to AndroidX (#2075)
Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.5.21+3

* Fix `myLocationButton` bug in `google_maps_flutter` iOS.

## 0.5.21+2

* Fix more `prefer_const_constructors` analyzer warnings in example app.
Expand Down
1 change: 0 additions & 1 deletion packages/google_maps_flutter/ios/Classes/GoogleMapController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ - (void)setZoomGesturesEnabled:(BOOL)enabled {

- (void)setMyLocationEnabled:(BOOL)enabled {
_mapView.myLocationEnabled = enabled;
_mapView.settings.myLocationButton = enabled;
}

- (void)setMyLocationButtonEnabled:(BOOL)enabled {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_maps_flutter
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
author: Flutter Team <[email protected]>
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
version: 0.5.21+2
version: 0.5.21+3

dependencies:
flutter:
Expand Down
4 changes: 4 additions & 0 deletions packages/instrumentation_adapter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.4

* Migrate example to AndroidX.

## 0.1.3

* Added example app.
Expand Down
2 changes: 2 additions & 0 deletions packages/instrumentation_adapter/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
org.gradle.jvmargs=-Xmx1536M

android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion packages/instrumentation_adapter/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: instrumentation_adapter
description: Runs tests that use the flutter_test API as integration tests.
version: 0.1.3
version: 0.1.4
author: Flutter Team <[email protected]>
homepage: https://github.com/flutter/plugins/tree/master/packages/instrumentation_adapter

Expand Down