Fix deprecated java plugin conventions (#602)

wpilibsuite · Sep 12, 2023 · 127a0c1 · 127a0c1
1 parent 7b0a274
commit 127a0c1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/vscode-wpilib/resources/gradle/java/build.gradle b/vscode-wpilib/resources/gradle/java/build.gradle
@@ -3,8 +3,10 @@ plugins {
     id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
 

diff --git a/vscode-wpilib/resources/gradle/javadt/build.gradle b/vscode-wpilib/resources/gradle/javadt/build.gradle
@@ -3,6 +3,11 @@ plugins {
     id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
 
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.

diff --git a/vscode-wpilib/resources/gradle/javaromi/build.gradle b/vscode-wpilib/resources/gradle/javaromi/build.gradle
@@ -3,8 +3,10 @@ plugins {
     id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
 

diff --git a/vscode-wpilib/resources/gradle/javaxrp/build.gradle b/vscode-wpilib/resources/gradle/javaxrp/build.gradle
@@ -3,8 +3,10 @@ plugins {
     id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"