diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
index 62dd71a1a5..f257b3bb99 100644
--- a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
+++ b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
@@ -123,7 +123,7 @@ public final class CameraServer {
       }
     }
 
-    return values.toArray(String[]::new);
+    return values.toArray(new String[0]);
   }
 
   @SuppressWarnings({"JavadocMethod", "PMD.AvoidUsingHardCodedIP"})
diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index abf3c2d20c..6595223e13 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -100,9 +100,8 @@ sourceSets {
     dev
 }
 
-compileJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs = ['--release', '8']
 }
 
 dependencies {
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CameraServer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CameraServer.java
index 2a19189bc5..a25ab2ee8a 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CameraServer.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CameraServer.java
@@ -129,7 +129,7 @@ public final class CameraServer {
       }
     }
 
-    return values.toArray(String[]::new);
+    return values.toArray(new String[0]);
   }
 
   @SuppressWarnings({"JavadocMethod", "PMD.AvoidUsingHardCodedIP"})
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/RecordingController.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/RecordingController.java
index dbbdc383a5..9f04274c28 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/RecordingController.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/RecordingController.java
@@ -48,7 +48,7 @@ final class RecordingController {
   }
 
   public void addEventMarker(String name, String description, EventImportance importance) {
-    if (name == null || name.isEmpty() || name.isBlank()) {
+    if (name == null || name.isEmpty()) {
       DriverStation.reportError(
           "Shuffleboard event name was not specified", true);
       return;
@@ -60,7 +60,7 @@ final class RecordingController {
       return;
     }
 
-    String eventDescription = description == null || description.isBlank() ? "" : description;
+    String eventDescription = description == null ? "" : description;
 
     m_eventsTable.getSubTable(name)
         .getEntry("Info")
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java
index 470b59168a..585970574c 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java
@@ -152,7 +152,7 @@ public class SendableChooser<V> extends SendableBase {
       return m_defaultChoice;
     }, null);
     builder.addStringArrayProperty(OPTIONS, () -> {
-      return m_map.keySet().toArray(String[]::new);
+      return m_map.keySet().toArray(new String[0]);
     }, null);
     builder.addStringProperty(ACTIVE, () -> {
       m_mutex.lock();