Skip to content

Commit 4b6b6b2

Browse files
author
Emmanuel Garcia
authored
Use OpenJDK 11 in CI jobs (flutter#4419)
1 parent 489c913 commit 4b6b6b2

File tree

8 files changed

+10
-19
lines changed

8 files changed

+10
-19
lines changed

.ci/Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ FROM cirrusci/flutter:2.2.2
55

66
RUN apt-get update -y
77

8-
# Required by Roboeletric and the Android SDK.
9-
RUN apt-get install -y openjdk-8-jdk
10-
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
11-
128
RUN apt-get install -y --no-install-recommends gnupg
139

1410
# Add repo for gcloud sdk and install it

packages/connectivity/connectivity/example/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ flutter {
5252
}
5353

5454
dependencies {
55-
testImplementation 'junit:junit:4.12'
55+
testImplementation 'junit:junit:4.13'
56+
testImplementation 'org.robolectric:robolectric:4.4'
57+
testImplementation 'org.mockito:mockito-core:3.5.13'
5658
androidTestImplementation 'androidx.test:runner:1.1.1'
5759
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
58-
testImplementation 'org.robolectric:robolectric:3.8'
59-
testImplementation 'org.mockito:mockito-core:3.5.13'
6060
}

packages/connectivity/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties

-5
This file was deleted.

packages/connectivity/connectivity/example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.5.0'
8+
classpath 'com.android.tools.build:gradle:7.0.1'
99
}
1010
}
1111

packages/connectivity/connectivity/example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

packages/video_player/video_player/example/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ flutter {
5858
}
5959

6060
dependencies {
61-
testImplementation 'junit:junit:4.12'
61+
testImplementation 'junit:junit:4.13'
62+
testImplementation 'org.robolectric:robolectric:4.4'
63+
testImplementation 'org.mockito:mockito-core:3.5.13'
6264
androidTestImplementation 'androidx.test:runner:1.1.1'
6365
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
64-
testImplementation 'org.robolectric:robolectric:3.8'
65-
testImplementation 'org.mockito:mockito-core:3.5.13'
6666
}

packages/video_player/video_player/example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.5.0'
8+
classpath 'com.android.tools.build:gradle:7.0.1'
99
}
1010
}
1111

packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

0 commit comments

Comments
 (0)