Skip to content

Commit 485a419

Browse files
otopbaotopba
authored
Merge pull request flutter#9 from flutter/master
Update master
2 parents 58192f4 + f31d16a commit 485a419

File tree

462 files changed

+8624
-2493
lines changed

Some content is hidden

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

462 files changed

+8624
-2493
lines changed

‎.ci/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
FROM cirrusci/flutter:stable
22

3+
RUN sudo apt-get update -y
4+
5+
RUN sudo apt-get install -y --no-install-recommends gnupg
6+
7+
# Add repo for gcloud sdk and install it
8+
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
9+
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
10+
11+
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
12+
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
13+
14+
RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
15+
gcloud config set core/disable_usage_reporting true && \
16+
gcloud config set component_manager/disable_update_check true
17+
318
RUN yes | sdkmanager \
419
"platforms;android-27" \
520
"build-tools;27.0.3" \

‎.cirrus.yml

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,59 @@ task:
55
cpu: 8
66
memory: 16G
77
upgrade_script:
8+
- flutter channel stable
9+
- flutter upgrade
810
- flutter channel master
911
- flutter upgrade
1012
- git fetch origin master
1113
activate_script: pub global activate flutter_plugin_tools
1214
matrix:
1315
- name: publishable
14-
script: ./script/check_publish.sh
15-
- name: test+format
16+
script:
17+
- flutter channel stable
18+
- ./script/check_publish.sh
19+
- name: format
1620
install_script:
1721
- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
1822
- sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
1923
- sudo apt-get update
2024
- sudo apt-get install -y --allow-unauthenticated clang-format-7
2125
format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
22-
test_script: ./script/incremental_build.sh test
26+
- name: test
27+
env:
28+
matrix:
29+
CHANNEL: "master"
30+
CHANNEL: "stable"
31+
test_script:
32+
# TODO(jackson): Allow web plugins once supported on stable
33+
# https://github.com/flutter/flutter/issues/42864
34+
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
35+
- flutter channel $CHANNEL
36+
- ./script/incremental_build.sh test
2337
- name: analyze
2438
script: ./script/incremental_build.sh analyze
2539
- name: build_all_plugins_apk
26-
script: ./script/build_all_plugins_app.sh apk
27-
- name: build-apks+java-test+drive-examples
40+
script:
41+
# TODO(jackson): Allow web plugins once supported on stable
42+
# https://github.com/flutter/flutter/issues/42864
43+
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
44+
- flutter channel $CHANNEL
45+
- ./script/build_all_plugins_app.sh apk
46+
- name: build-apks+java-test+firebase-test-lab
2847
env:
2948
matrix:
3049
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
3150
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
51+
matrix:
52+
CHANNEL: "master"
53+
CHANNEL: "stable"
3254
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
55+
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
3356
script:
57+
# TODO(jackson): Allow web plugins once supported on stable
58+
# https://github.com/flutter/flutter/issues/42864
59+
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
60+
- flutter channel $CHANNEL
3461
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
3562
# might include non-ASCII characters which makes Gradle crash.
3663
# See: https://github.com/flutter/flutter/issues/24935
@@ -43,6 +70,12 @@ task:
4370
- export CIRRUS_COMMIT_MESSAGE=""
4471
- ./script/incremental_build.sh build-examples --apk
4572
- ./script/incremental_build.sh java-test # must come after apk build
73+
- if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then
74+
- echo "This user does not have permission to run Firebase Test Lab tests."
75+
- else
76+
- echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
77+
- ./script/incremental_build.sh firebase-test-lab
78+
- fi
4679
- export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
4780
- export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
4881

@@ -53,17 +86,23 @@ task:
5386
setup_script:
5487
- pod repo update
5588
upgrade_script:
89+
- flutter channel stable
90+
- flutter upgrade
5691
- flutter channel master
5792
- flutter upgrade
5893
- git fetch origin master
59-
activate_script:
60-
- pub global activate flutter_plugin_tools
94+
activate_script: pub global activate flutter_plugin_tools
6195
create_simulator_script:
6296
- xcrun simctl list
6397
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2 | xargs xcrun simctl boot
6498
matrix:
6599
- name: build_all_plugins_ipa
66-
script: ./script/build_all_plugins_app.sh ios --no-codesign
100+
script:
101+
# TODO(jackson): Allow web plugins once supported on stable
102+
# https://github.com/flutter/flutter/issues/42864
103+
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
104+
- flutter channel $CHANNEL
105+
- ./script/build_all_plugins_app.sh ios --no-codesign
67106
- name: lint_darwin_plugins
68107
script: ./script/lint_darwin_plugins.sh
69108
- name: build-ipas+drive-examples
@@ -74,7 +113,14 @@ task:
74113
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
75114
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
76115
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
116+
matrix:
117+
CHANNEL: "master"
118+
CHANNEL: "stable"
77119
SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
78120
build_script:
121+
# TODO(jackson): Allow web plugins once supported on stable
122+
# https://github.com/flutter/flutter/issues/42864
123+
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
124+
- flutter channel $CHANNEL
79125
- ./script/incremental_build.sh build-examples --ipa
80126
- ./script/incremental_build.sh drive-examples

‎packages/android_alarm_manager/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.4+2
2+
3+
* Remove AndroidX warning.
4+
15
## 0.4.4+1
26

37
* Update and migrate iOS example project.

‎packages/android_alarm_manager/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
def PLUGIN = "android_alarm_manager";
2-
def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
3-
gradle.buildFinished { buildResult ->
4-
if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
5-
println ' *********************************************************'
6-
println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
7-
println ' See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
8-
println ' This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
9-
println ' *********************************************************'
10-
rootProject.ext.set(ANDROIDX_WARNING, true);
11-
}
12-
}
13-
141
group 'io.flutter.plugins.androidalarmmanager'
152
version '1.0-SNAPSHOT'
163

‎packages/android_alarm_manager/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: android_alarm_manager
22
description: Flutter plugin for accessing the Android AlarmManager service, and
33
running Dart code in the background when alarms fire.
4-
version: 0.4.4+1
4+
version: 0.4.4+2
55
author: Flutter Team <[email protected]>
66
homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
77

‎packages/android_intent/CHANGELOG.md

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
## 0.3.4+5
2+
3+
* Remove AndroidX warning.
4+
5+
## 0.3.4+4
6+
7+
* Include lifecycle dependency as a compileOnly one on Android to resolve
8+
potential version conflicts with other transitive libraries.
9+
10+
## 0.3.4+3
11+
12+
* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
13+
14+
## 0.3.4+2
15+
16+
* Fix resolveActivity not respecting the provided componentName.
17+
18+
## 0.3.4+1
19+
20+
* Fix minor lints in the Java platform code.
21+
* Add smoke e2e tests for the V2 embedding.
22+
* Fully migrate the example app to AndroidX.
23+
24+
## 0.3.4
25+
26+
* Migrate the plugin to use the V2 Android engine embedding. This shouldn't
27+
affect existing functionality. Plugin authors who use the V2 embedding can now
28+
instantiate the plugin and expect that it correctly responds to app lifecycle
29+
changes.
30+
131
## 0.3.3+3
232

333
* Define clang module for iOS.
@@ -8,11 +38,11 @@
838

939
## 0.3.3+1
1040

11-
* Added "action_application_details_settings" action to open application info settings .
41+
* Added "action_application_details_settings" action to open application info settings .
1242

1343
## 0.3.3
1444

15-
* Added "flags" option to call intent.addFlags(int) in native.
45+
* Added "flags" option to call intent.addFlags(int) in native.
1646

1747
## 0.3.2
1848

‎packages/android_intent/android/build.gradle

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
def PLUGIN = "android_intent";
2-
def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
3-
gradle.buildFinished { buildResult ->
4-
if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
5-
println ' *********************************************************'
6-
println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
7-
println ' See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
8-
println ' This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
9-
println ' *********************************************************'
10-
rootProject.ext.set(ANDROIDX_WARNING, true);
11-
}
12-
}
13-
141
group 'io.flutter.plugins.androidintent'
152
version '1.0-SNAPSHOT'
163

@@ -44,4 +31,41 @@ android {
4431
lintOptions {
4532
disable 'InvalidPackage'
4633
}
34+
testOptions {
35+
unitTests.includeAndroidResources = true
36+
}
37+
}
38+
39+
dependencies {
40+
compileOnly 'androidx.annotation:annotation:1.0.0'
41+
testImplementation 'junit:junit:4.12'
42+
testImplementation 'org.mockito:mockito-core:1.10.19'
43+
testImplementation 'androidx.test:core:1.0.0'
44+
testImplementation 'org.robolectric:robolectric:4.3'
45+
}
46+
47+
// TODO(mklim): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348
48+
afterEvaluate {
49+
def containsEmbeddingDependencies = false
50+
for (def configuration : configurations.all) {
51+
for (def dependency : configuration.dependencies) {
52+
if (dependency.group == 'io.flutter' &&
53+
dependency.name.startsWith('flutter_embedding') &&
54+
dependency.isTransitive())
55+
{
56+
containsEmbeddingDependencies = true
57+
break
58+
}
59+
}
60+
}
61+
if (!containsEmbeddingDependencies) {
62+
android {
63+
dependencies {
64+
def lifecycle_version = "1.1.1"
65+
compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
66+
compileOnly "android.arch.lifecycle:common:$lifecycle_version"
67+
compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
68+
}
69+
}
70+
}
4771
}

‎packages/android_intent/android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
android.enableJetifier=true
2-
android.useAndroidX=true
31
org.gradle.jvmargs=-Xmx1536M

0 commit comments

Comments
 (0)