Merge branch 'develop'

This commit is contained in:
Thibault Deckers 2020-07-26 12:39:15 +09:00
commit fb42fe7ecc
3 changed files with 9 additions and 8 deletions

View file

@ -2,6 +2,7 @@ include: package:pedantic/analysis_options.yaml
analyzer: analyzer:
exclude: exclude:
- lib/flutter_version.dart
- lib/generated_plugin_registrant.dart - lib/generated_plugin_registrant.dart
# strong-mode: # strong-mode:

View file

@ -1,10 +1,10 @@
// run `scripts/update_flutter_version.sh` to update with the content of `flutter --version --machine` // run `scripts/update_flutter_version.sh` to update with the content of `flutter --version --machine`
const Map<String, String> version = { const Map<String, String> version = {
'channel': 'unknown', "channel": "unknown",
'dartSdkVersion': 'unknown', "dartSdkVersion": "unknown",
'engineRevision': 'unknown', "engineRevision": "unknown",
'frameworkCommitDate': 'unknown', "frameworkCommitDate": "unknown",
'frameworkRevision': 'unknown', "frameworkRevision": "unknown",
'frameworkVersion': 'unknown', "frameworkVersion": "unknown",
'repositoryUrl': 'unknown', "repositoryUrl": "unknown",
}; };

View file

@ -11,7 +11,7 @@ description: A new Flutter application.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.1.0+12 version: 1.1.1+13
# video_player (as of v0.10.8+2, backed by ExoPlayer): # video_player (as of v0.10.8+2, backed by ExoPlayer):
# - does not support content URIs (by default, but trivial by fork) # - does not support content URIs (by default, but trivial by fork)