Use OpenJDK 11 in CI jobs (flutter#4419)

Emmanuel Garcia · web-flow · commit 4b6b6b24c7a5 · 2021-10-21T17:17:18.000-07:00
diff --git 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/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
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ flutter {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`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'`
`56`	`58`	`androidTestImplementation 'androidx.test:runner:1.1.1'`
`57`	`59`	`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'`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.5.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:7.0.1'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ flutter {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`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'`
`62`	`64`	`androidTestImplementation 'androidx.test:runner:1.1.1'`
`63`	`65`	`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'`
`66`	`66`	`}`