Skip to content

Commit c2732ba

Browse files
committed
Merge branch 'master' into kg-connectivity-ios-permissions
* master: [url_launcher, url_launcher_web]Added webOnlyWindowName parameter to launch() (flutter#2979) [battery_platform_interface] Introduce package. (flutter#2975) [url_launcher_platform_interface] Add webOnlyWindowName parameter to launch() (flutter#2974) [share] Add sharing file support (android & ios) (flutter#970) [integration_test] add support to get timeline (flutter#2947) [battery] Moved battery to its own subdir (flutter#2969) [integration_test] Fix channel name for iOS, docs (flutter#2972) [integration_test] Show stack trace of widget test errors on the platform side (flutter#2967) [video_player] Fix `setWithOthers` test (flutter#2970) [video_player_platform_interface] fix `setMixIWithOthers` test channel (flutter#2968) Add README instructions for enablePendingPurchases (flutter#2921) Rebase previous commits (flutter#2966) Avoid walleye 26 Updating documentation to use isEmpty check. (flutter#2955) [integration_test] Minor cleanup (flutter#2956) [path_provider, video_player] Tweak pubspecs to pass bulk analysis. (flutter#2959) [android_intent] fix platform package dep (flutter#2948) [shared_preferences_linux] update `file` package dep version to be compatible with framework (flutter#2950)
2 parents 1078109 + 7c49361 commit c2732ba

134 files changed

Lines changed: 1294 additions & 216 deletions

File tree

Some content is hidden

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

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ task:
9393
- echo "This user does not have permission to run Firebase Test Lab tests."
9494
- else
9595
- echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
96-
- ./script/incremental_build.sh firebase-test-lab
96+
- ./script/incremental_build.sh firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26
9797
- fi
9898
- export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
9999
- export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`

packages/android_intent/CHANGELOG.md

Lines changed: 4 additions & 0 deletions

packages/android_intent/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
44
# 0.3.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.3.7+2
7+
version: 0.3.7+3
88

99
flutter:
1010
plugin:
@@ -16,7 +16,7 @@ flutter:
1616
dependencies:
1717
flutter:
1818
sdk: flutter
19-
platform: ^2.0.0
19+
platform: ">=2.0.0 <4.0.0"
2020
meta: ^1.0.5
2121
dev_dependencies:
2222
test: ^1.3.0
Lines changed: 8 additions & 0 deletions
Lines changed: 2 additions & 2 deletions
File renamed without changes.
File renamed without changes.

packages/battery/android/gradle/wrapper/gradle-wrapper.properties renamed to packages/battery/battery/android/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)