Skip to content

Commit 48710ed

Browse files
author
Jeremy
committed
Merge branch 'master' into patched
* master: (69 commits) [google_maps_flutter_platform_interface] Adds support for holes in polygon overlays to the Google Maps plugin (flutter#3135) [camera] Add iOS and Android implementations for managing auto focus. (flutter#3370) [camera] Implemented ImageStream ImageFormat setting for Dart and Android (flutter#3359) Sync the PR template to the new style (flutter#3397) [battery] Migrate battery_plugin_interface to null safety (flutter#3366) Ignore deprecated_member_use analysis lint (flutter#3400) fix version (flutter#3399) Update obsolete button refs in plugin examples (flutter#3395) [in_app_purchase] Added serviceTimeout code (flutter#3287) [image_picker] Update README.md (flutter#3098) [camera] set useAutoFocus to true by default (flutter#3396) [camera_platform_interface] Add platform interface methods for locking capture orientation. (flutter#3389) [camera_platform_interface] Add platform interface methods for setting auto focus. (flutter#3369) [camera] disable auto focus when using front facing camera on Android (flutter#3383) [camera] Fixed stale images in imageStream subscriptions (flutter#3344) [camera_platform_interface] Added imageFormatGroup to initialize (flutter#3364) Added closeCaptureSession() to stopVideoRecording in Camera.java to fix an Android 6 crash (flutter#3336) [camera] Add iOS and Android implementations for managing auto exposure. (flutter#3346) Change platform interface dependency (flutter#3377) Update camera_platform_interface to 1.2.0 (flutter#3376) ... # Conflicts: # packages/webview_flutter/lib/src/webview_method_channel.dart
2 parents 804f965 + a0e7937 commit 48710ed

File tree

382 files changed

+11705
-3208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+11705
-3208
lines changed

.cirrus.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,16 @@ task:
3939
- flutter channel $CHANNEL
4040
- ./script/incremental_build.sh test
4141
- name: analyze
42+
env:
43+
matrix:
44+
CHANNEL: "master"
45+
CHANNEL: "stable"
4246
script: ./script/incremental_build.sh analyze
4347
- name: build_all_plugins_apk
48+
env:
49+
matrix:
50+
CHANNEL: "master"
51+
CHANNEL: "stable"
4452
script:
4553
# TODO(jackson): Allow web plugins once supported on stable
4654
# https://github.com/flutter/flutter/issues/42864
@@ -132,6 +140,7 @@ task:
132140
osx_instance:
133141
image: catalina-xcode-11.3.1-flutter
134142
upgrade_script:
143+
- sudo gem install cocoapods
135144
- flutter channel stable
136145
- flutter upgrade
137146
- flutter channel master
@@ -143,6 +152,10 @@ task:
143152
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
144153
matrix:
145154
- name: build_all_plugins_ipa
155+
env:
156+
matrix:
157+
CHANNEL: "master"
158+
CHANNEL: "stable"
146159
script:
147160
# TODO(jackson): Allow web plugins once supported on stable
148161
# https://github.com/flutter/flutter/issues/42864
@@ -190,6 +203,7 @@ task:
190203
setup_script:
191204
- flutter config --enable-macos-desktop
192205
upgrade_script:
206+
- sudo gem install cocoapods
193207
- flutter channel master
194208
- flutter upgrade
195209
- git fetch origin master

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,32 @@
1-
## Description
1+
*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.*
22

3-
*Replace this paragraph with a description of what this PR is doing. If you're modifying existing behavior, describe the existing behavior, how this PR is changing it, and what motivated the change.*
3+
*List which issues are fixed by this PR. You must list at least one issue.*
44

5-
## Related Issues
5+
*If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
66

7-
*Replace this paragraph with a list of issues related to this PR from the [issue database](https://github.com/flutter/flutter/issues). Indicate, which of these issues are resolved or fixed by this PR. Note that you'll have to prefix the issue numbers with flutter/flutter#.*
8-
9-
## Checklist
10-
11-
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
7+
## Pre-launch Checklist
128

9+
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
1310
- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
14-
- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]).
15-
- [ ] All existing and new tests are passing.
16-
- [ ] I updated/added relevant documentation (doc comments with `///`).
17-
- [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.
18-
- [ ] I read and followed the [Flutter Style Guide].
19-
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
11+
- [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
12+
- [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
13+
- [ ] I listed at least one issue that this PR fixes in the description above.
14+
- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
2015
- [ ] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
2116
- [ ] I updated CHANGELOG.md to add a description of the change.
17+
- [ ] I updated/added relevant documentation (doc comments with `///`).
2218
- [ ] I signed the [CLA].
23-
- [ ] I am willing to follow-up on review comments in a timely manner.
24-
25-
## Breaking Change
26-
27-
Does your PR require plugin users to manually update their apps to accommodate your change?
19+
- [ ] All existing and new tests are passing.
2820

29-
- [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
30-
- [ ] No, this is *not* a breaking change.
21+
If you need help, consider asking for advice on the #hackers-new channel on [Discord].
3122

3223
<!-- Links -->
33-
[issue database]: https://github.com/flutter/flutter/issues
34-
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
24+
[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
25+
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
3526
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
36-
[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
27+
[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
3728
[CLA]: https://cla.developers.google.com/
29+
[flutter/tests]: https://github.com/flutter/tests
30+
[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
31+
[Discord]: https://github.com/flutter/flutter/wiki/Chat
32+
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ Kazuki Yamaguchi <y.kazuki0614n@gmail.com>
5959
Eitan Schwartz <eshvartz@gmail.com>
6060
Chris Rutkowski <chrisrutkowski89@gmail.com>
6161
Juan Alvarez <juan.alvarez@resideo.com>
62+
Aleksandr Yurkovskiy <sanekyy@gmail.com>

CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
55

6-
_See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
6+
_See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
77

88
## Things you will need
99

@@ -131,17 +131,16 @@ pub global run flutter_plugin_tools xctest --target RunnerUITests --skip <plugin
131131
We gladly accept contributions via GitHub pull requests.
132132

133133
Please peruse our
134-
[style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo) and
135-
[design principles](https://flutter.io/design-principles/) before
136-
working on anything non-trivial. These guidelines are intended to
134+
[style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo)
135+
before working on anything non-trivial. These guidelines are intended to
137136
keep the code consistent and avoid common pitfalls.
138137

139138
To start working on a patch:
140139

141140
* `git fetch upstream`
142141
* `git checkout upstream/master -b <name_of_your_branch>`
143142
* Hack away.
144-
* Verify changes with [flutter_plugin_tools](https://pub.dartlang.org/packages/flutter_plugin_tools)
143+
* Verify changes with [flutter_plugin_tools](https://pub.dev/packages/flutter_plugin_tools)
145144
```
146145
pub global activate flutter_plugin_tools
147146
pub global run flutter_plugin_tools format --plugins plugin_name

analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ analyzer:
44
# Ignore generated files
55
- '**/*.g.dart'
66
- 'lib/src/generated/*.dart'
7+
errors:
8+
always_require_non_null_named_parameters: false # not needed with nnbd
9+
unnecessary_null_comparison: false # Turned as long as nnbd mix-mode is supported.
710
linter:
811
rules:
912
- public_member_api_docs

packages/android_alarm_manager/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 0.4.5+20
2+
3+
* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
4+
5+
## 0.4.5+19
6+
7+
* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
8+
9+
## 0.4.5+18
10+
11+
* Update Flutter SDK constraint.
12+
113
## 0.4.5+17
214

315
* Update Dart SDK constraint in example.

packages/android_alarm_manager/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# android_alarm_manager
22

3-
[![pub package](https://img.shields.io/pub/v/android_alarm_manager.svg)](https://pub.dartlang.org/packages/android_alarm_manager)
3+
[![pub package](https://img.shields.io/pub/v/android_alarm_manager.svg)](https://pub.dev/packages/android_alarm_manager)
44

55
A Flutter plugin for accessing the Android AlarmManager service, and running
66
Dart code in the background when alarms fire.
@@ -36,7 +36,7 @@ Next, within the `<application></application>` tags, add:
3636
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
3737
android:enabled="false">
3838
<intent-filter>
39-
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
39+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
4040
</intent-filter>
4141
</receiver>
4242

@@ -121,6 +121,6 @@ register plugins. This can be resolved by running `flutter upgrade` to upgrade
121121
to the latest Flutter version.**
122122

123123
For help getting started with Flutter, view our online
124-
[documentation](http://flutter.io/).
124+
[documentation](https://flutter.dev/).
125125

126-
For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
126+
For help on editing plugin code, view the [documentation](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin).

packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
4242
android:enabled="false">
4343
<intent-filter>
44-
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
44+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
4545
</intent-filter>
4646
</receiver>
4747
<meta-data

packages/android_alarm_manager/example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
131131
),
132132
],
133133
),
134-
RaisedButton(
134+
ElevatedButton(
135135
child: Text(
136136
'Schedule OneShot Alarm',
137137
),

packages/android_alarm_manager/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Flutter plugin for accessing the Android AlarmManager service, and
44
# 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
55
# the version to 2.0.0.
66
# See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
7-
version: 0.4.5+17
7+
version: 0.4.5+20
88
homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
99

1010
dependencies:
@@ -25,4 +25,4 @@ flutter:
2525

2626
environment:
2727
sdk: ">=2.1.0 <3.0.0"
28-
flutter: ">=1.12.13+hotfix.5 <2.0.0"
28+
flutter: ">=1.12.13+hotfix.5"

0 commit comments

Comments
 (0)