From 21f92a19b193b6507ed47f480c2e65a29bc74d7b Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 12:05:41 -0700 Subject: [PATCH 1/7] Fix Java version --- .ci/Dockerfile | 4 ---- .cirrus.yml | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index a3deb6948d90..60f82eb005ed 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -5,10 +5,6 @@ FROM cirrusci/flutter:2.2.2 RUN apt-get update -y -# Required by Roboeletric and the Android SDK. -RUN apt-get install -y openjdk-8-jdk -ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - RUN apt-get install -y --no-install-recommends gnupg # Add repo for gcloud sdk and install it diff --git a/.cirrus.yml b/.cirrus.yml index ef6b9c1b6d44..9d83e19beae3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,6 +32,7 @@ build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE create_all_plugins_app_script: - dart $PLUGIN_TOOL all-plugins-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml build_all_plugins_debug_script: + - env - cd all_plugins - if [[ "$BUILD_ALL_ARGS" == "web" ]]; then - echo "Skipping; web does not support debug builds" From 06c13edb1201f6521aa8dfd12c12aae100fcf7d9 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 12:45:35 -0700 Subject: [PATCH 2/7] Debug JVMs --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 9d83e19beae3..063ff8d39103 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,6 +33,7 @@ build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE - dart $PLUGIN_TOOL all-plugins-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml build_all_plugins_debug_script: - env + - ls -la /usr/lib/jvm/ - cd all_plugins - if [[ "$BUILD_ALL_ARGS" == "web" ]]; then - echo "Skipping; web does not support debug builds" From 5d145a2582413bec4e6deff066353c4c63644793 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 12:55:39 -0700 Subject: [PATCH 3/7] Remove --- .cirrus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 063ff8d39103..ef6b9c1b6d44 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,8 +32,6 @@ build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE create_all_plugins_app_script: - dart $PLUGIN_TOOL all-plugins-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml build_all_plugins_debug_script: - - env - - ls -la /usr/lib/jvm/ - cd all_plugins - if [[ "$BUILD_ALL_ARGS" == "web" ]]; then - echo "Skipping; web does not support debug builds" From 8d52fbe2df55cf1f6010c9620920255c6df947b6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 15:27:34 -0700 Subject: [PATCH 4/7] Fix Gradle version --- .../connectivity/example/android/app/build.gradle | 6 +++--- .../android/app/gradle/wrapper/gradle-wrapper.properties | 5 ----- .../connectivity/connectivity/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 packages/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/connectivity/connectivity/example/android/app/build.gradle b/packages/connectivity/connectivity/example/android/app/build.gradle index 64f3d0626bf4..99e360558af8 100644 --- a/packages/connectivity/connectivity/example/android/app/build.gradle +++ b/packages/connectivity/connectivity/example/android/app/build.gradle @@ -52,9 +52,9 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' + testImplementation 'org.robolectric:robolectric:4.4' + testImplementation 'org.mockito:mockito-core:3.5.13' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - testImplementation 'org.robolectric:robolectric:3.8' - testImplementation 'org.mockito:mockito-core:3.5.13' } diff --git a/packages/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 9a4163a4f5ee..000000000000 --- a/packages/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/connectivity/connectivity/example/android/build.gradle b/packages/connectivity/connectivity/example/android/build.gradle index 456d020f6e2c..c21bff8e0a2f 100644 --- a/packages/connectivity/connectivity/example/android/build.gradle +++ b/packages/connectivity/connectivity/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.1' } } diff --git a/packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties index 01a286e96a21..297f2fec363f 100644 --- a/packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From 74dbfc325333057d75266e29e2582108370e7d0b Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 15:58:51 -0700 Subject: [PATCH 5/7] Fix video_player --- .../video_player/example/android/app/build.gradle | 6 +++--- .../video_player/video_player/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/video_player/video_player/example/android/app/build.gradle b/packages/video_player/video_player/example/android/app/build.gradle index 0d1d5031ef4f..5f1f3afa6352 100644 --- a/packages/video_player/video_player/example/android/app/build.gradle +++ b/packages/video_player/video_player/example/android/app/build.gradle @@ -58,9 +58,9 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' + testImplementation 'org.robolectric:robolectric:4.4' + testImplementation 'org.mockito:mockito-core:3.5.13' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - testImplementation 'org.robolectric:robolectric:3.8' - testImplementation 'org.mockito:mockito-core:3.5.13' } diff --git a/packages/video_player/video_player/example/android/build.gradle b/packages/video_player/video_player/example/android/build.gradle index 456d020f6e2c..c21bff8e0a2f 100644 --- a/packages/video_player/video_player/example/android/build.gradle +++ b/packages/video_player/video_player/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.1' } } diff --git a/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties index 296b146b7318..b8793d3c0d69 100644 --- a/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From e888e2db7296bf276982f710f37ce7f672d875bd Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 7 Oct 2021 16:31:05 -0700 Subject: [PATCH 6/7] Cirrus does not support lint format 6 --- .cirrus.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ef6b9c1b6d44..99607a5ab7f6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -218,12 +218,6 @@ task: - else - echo "This user does not have permission to run Firebase Test Lab tests." - fi - # Upload the full lint results to Cirrus to display in the results UI. - always: - android-lint_artifacts: - path: "**/reports/lint-results-debug.xml" - type: text/xml - format: android-lint ### Web tasks ### - name: web-platform_tests env: From 070252f8213bb01a2359ab51af99e259f5afca5f Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Thu, 21 Oct 2021 14:44:09 -0700 Subject: [PATCH 7/7] Add the linter back --- .cirrus.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 99607a5ab7f6..ef6b9c1b6d44 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -218,6 +218,12 @@ task: - else - echo "This user does not have permission to run Firebase Test Lab tests." - fi + # Upload the full lint results to Cirrus to display in the results UI. + always: + android-lint_artifacts: + path: "**/reports/lint-results-debug.xml" + type: text/xml + format: android-lint ### Web tasks ### - name: web-platform_tests env: