diff --git a/build.gradle b/build.gradle
index c6a5dffac49..2578558f9ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'net.ltgt.errorprone' version '0.0.15'
     id 'base'
     id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.1'
     id 'edu.wpi.first.NativeUtils' version '1.7.1'
@@ -7,6 +6,8 @@ plugins {
     id 'edu.wpi.first.GradleVsCode' version '0.4.1'
     id 'idea'
     id 'com.gradle.build-scan' version '1.15.1'
+    id 'net.ltgt.errorprone' version '0.0.15' apply false // For Java 8
+    id 'net.ltgt.errorprone-javacplugin' version '0.3' apply false // For Java 9+
 }
 
 repositories {
diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index f92028edd9d..6efc975e2f7 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -1,6 +1,11 @@
 apply plugin: 'maven-publish'
 apply plugin: 'java'
-apply plugin: 'net.ltgt.errorprone'
+
+if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+    apply plugin: 'net.ltgt.errorprone'
+} else {
+    apply plugin: 'net.ltgt.errorprone-javacplugin'
+}
 
 def pubVersion
 if (project.hasProperty("publishVersion")) {