update things for 2021, new commands

Author: James Hagborg

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
 }
 
-sourceCompatibility = 1.8
+//sourceCompatibility = 1.8
 
 jgitver {
   mavenLike = true
@@ -16,39 +16,41 @@ allprojects {
     repositories {
         mavenCentral()
         maven {
-            url 'http://first.wpi.edu/FRC/roborio/maven/release'
+            url 'https://frcmaven.wpi.edu/artifactory/release'
         }
     }
 }
 
-def WPILIB_VER = '2019.2.1'
+def WPILIB_VER = '2021.2.2'
 def NTCORE_VER = WPILIB_VER
-def OPENCV_VER = '3.4.4-4'
+def OPENCV_VER = '3.4.7-5'
 def WPIUTIL_VER = WPILIB_VER
 def CSCORE_VER = WPILIB_VER
 def CAMERASERVER_VER = WPILIB_VER
 def JUNIT_VER = '5.3.1'
+def ARCH = 'linuxx86-64'
 
 dependencies {
     // We may or may not need to add the new HAL library which was split off
     // from wpilib.  Ideally we don't have to touch it at all.
-    compile "edu.wpi.first.wpilibj:wpilibj-java:$WPILIB_VER"
-    compile "edu.wpi.first.ntcore:ntcore-java:$NTCORE_VER"
-    compile "edu.wpi.first.wpiutil:wpiutil-java:$WPIUTIL_VER"
-    compile "edu.wpi.first.cscore:cscore-java:$CSCORE_VER"
-    compile "edu.wpi.first.cameraserver:cameraserver-java:$CAMERASERVER_VER"
-    compile "edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:$OPENCV_VER"
+    implementation "edu.wpi.first.wpilibj:wpilibj-java:$WPILIB_VER"
+    implementation "edu.wpi.first.wpilibNewCommands:wpilibNewCommands-java:$WPILIB_VER"
+    implementation "edu.wpi.first.ntcore:ntcore-java:$NTCORE_VER"
+    implementation "edu.wpi.first.wpiutil:wpiutil-java:$WPIUTIL_VER"
+    implementation "edu.wpi.first.cscore:cscore-java:$CSCORE_VER"
+    implementation "edu.wpi.first.cameraserver:cameraserver-java:$CAMERASERVER_VER"
+    implementation "edu.wpi.first.thirdparty.frc2021.opencv:opencv-java:$OPENCV_VER"
 
     // Do not require these as runtime dependencies, since WPILib doesn't.
     // The user can figure out what version they need (RIO vs. desktop).
-    testRuntime "edu.wpi.first.ntcore:ntcore-jni:$NTCORE_VER:all"
-    testRuntime "edu.wpi.first.cscore:cscore-jni:$CSCORE_VER:all"
+    testRuntime "edu.wpi.first.ntcore:ntcore-jni:$NTCORE_VER:$ARCH"
+    testRuntime "edu.wpi.first.cscore:cscore-jni:$CSCORE_VER:$ARCH"
     testRuntime "org.junit.jupiter:junit-jupiter-engine:$JUNIT_VER"
 
-    testCompile "org.junit.jupiter:junit-jupiter-api:$JUNIT_VER"
-    testCompile "org.junit.jupiter:junit-jupiter-params:$JUNIT_VER"
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'com.google.guava:guava:19.0'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$JUNIT_VER"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$JUNIT_VER"
+    testImplementation 'org.hamcrest:hamcrest-library:1.3'
+    testImplementation 'com.google.guava:guava:19.0'
 }
 
 compileJava {
@@ -137,5 +139,5 @@ checkstyle {
 }
 
 wrapper {
-    gradleVersion = '4.10.2'
+    gradleVersion = '6.8.3'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists