Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Fix Java version #4419

Merged
blasten merged 8 commits into from
Oct 22, 2021
Merged

Fix Java version #4419

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21f92a1
Fix Java version
Oct 7, 2021
06c13ed
Debug JVMs
Oct 7, 2021
5d145a2
Remove
Oct 7, 2021
8d52fbe
Fix Gradle version
Oct 7, 2021
74dbfc3
Fix video_player
Oct 7, 2021
e888e2d
Cirrus does not support lint format 6
Oct 7, 2021
070252f
Add the linter back
Oct 21, 2021
7ea2d2b
Merge remote-tracking branch 'upstream/master' into fix_java_version
Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor

@stuartmorgan-g stuartmorgan-g Oct 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put a comment about this in the PR description, and file an issue. This was how we were surfacing the non-summary details, so this is a non-trivial regression that we'll need to address.

### Web tasks ###
- name: web-platform_tests
env:
Expand Down
6 changes: 3 additions & 3 deletions packages/connectivity/connectivity/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
5 changes: 0 additions & 5 deletions ...es/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/connectivity/connectivity/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.0.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions packages/video_player/video_player/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
2 changes: 1 addition & 1 deletion packages/video_player/video_player/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.0.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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