Get testing working in 2018, move Travis to Xenial.

Author: James Hagborg

.travis.yml

@@ -1,19 +1,13 @@
+dist: xenial
 language: java
-jdk:
-- oraclejdk8
-sudo: required
 
-services:
-- docker
-
-before_install:
-- docker build -t my-image .
-
-install:
-- echo "skip 'gradle assemble' step"
-
-script:
-- docker run -v "$(pwd):/hyperLib" my-image /hyperLib/.travis_docker_script.sh
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
 
 notifications:
   slack:
@@ -23,8 +17,6 @@ notifications:
 
 env:
   global:
-  - GRADLE_CACHES="/home/travis/.gradle"
-  - DOCKER_GRADLE_CACHES="/root/.gradle"
   - secure: KbemNv66/YeG1d5rh/DIQ/IzFGO+jkUIxyrC/Rv6qqgIAIzPljTAgvbOwlIS4VWxAc+6u3TgZ1ITHqcISmqQBd3xfqnSjzGyCmiumXmKjP3f/lsXOY0G2dqK8B5UxGyWfHuOldDIZxVs0nlNfW8cvgnVtWikAl+8oM+vZ6OFm6nZf1IqZU7PHHsF8sxi5H2PGo3IJjhkNNpjbi/N+KHpNyeKOPHGmu5jxUg1y+Xk+tpSDij/ko3URy5r1D+GX/BaZBAcRAIk4e1LIka4v6XVhbenO1vTKtmaoWhlSPpdjhi9/6No/rWWb2c+BzaN2hBhyU6g5ZY7goNsb9uzrh3LDWBiXoASPaVMOK17VTJRlARYcXRUK9HgAMj1o8wdgREVFKy8aTIX3amep2O114tnkTbCAefqWqESev5FMY/8TTsoUepO1f7La2EPt4xuckXJBLfb2yH8bbP8u8n8PtHjUJ+jmerGq3MlP8EQj21Qxk299KZ5/NaL2lnYN7krlb+2IMiDJX1Xb3AUVDtM3BFiCefLVPd7EAqbGgicSHRgal1YYaaOVmRq1kqBtTG72Pslh0PHRfjDpWG7NbNntZJG/S05iLJS9cpDeoyEri7mjC48L7Ej/V2Wwd0lEQyWf98FBFvWLja6S5o0VTjE5K1LEWoNpshxia7uZUYiW3JeC9o=
 
 deploy:

.travis_docker_script.sh

@@ -20,22 +20,30 @@ allprojects {
     }
 }
 
+def WPILIB_VER = '2019.1.1-beta-1'
+def OPENCV_VER = '3.4.3-15'
+def JUNIT_VER = '5.3.1'
+
 dependencies {
-    compile group: 'edu.wpi.first.wpilibj', name: 'wpilibj-java', version: '2018.+'
-    // We only need the desktop version right now, since this build file is only used for local testing.
-    compile group: 'edu.wpi.first.ntcore', name: 'ntcore-java', version: '4.+'
-    compile group: 'edu.wpi.first.wpiutil', name: 'wpiutil-java', version: '3.+'
-    compile group: 'org.opencv', name: 'opencv-java', version: '3.2.0'
-    compile group: 'edu.wpi.first.cscore', name: 'cscore-java', version: '1.3.+'
-    
-    runtime group: 'edu.wpi.first.wpilibj', name: 'wpilibj-jni', version: '2018.+', classifier: 'all'
-    runtime group: 'edu.wpi.first.ntcore', name: 'ntcore-jni', version: '4.+', classifier: 'all'
-    runtime group: 'org.opencv', name: 'opencv-jni', version: '3.2.0', classifier: 'all'
-    runtime group: 'edu.wpi.first.cscore', name: 'cscore-jni', version: '1.3.+', classifier: 'all'
+    // 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:$WPILIB_VER"
+    compile "edu.wpi.first.wpiutil:wpiutil-java:$WPILIB_VER"
+    compile "edu.wpi.first.cscore:cscore-java:$WPILIB_VER"
+    compile "edu.wpi.first.cameraserver:cameraserver-java:$WPILIB_VER"
+    compile "edu.wpi.first.thirdparty.frc2019.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:$WPILIB_VER:all"
+    testRuntime "edu.wpi.first.cscore:cscore-jni:$WPILIB_VER:all"
+    testRuntime "org.junit.jupiter:junit-jupiter-engine:$JUNIT_VER"
 
-    testCompile group: 'junit', name: 'junit', version: '4.+'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
-    testCompile group: 'com.google.guava', name: 'guava', version: '19.0'
+    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'
 }
 
 test {
@@ -64,34 +72,34 @@ artifacts {
 
 publishing {
     publications {
-	mavenPublication(MavenPublication) {
-	    from components.java
-	    artifact sourcesJar {
-		classifier 'sources'
-	    }
-	    artifact javadocJar {
-		classifier 'javadoc'
-	    }
-	    
-	    groupId 'org.hyperonline'
-	    artifactId 'hyperlib'
-	    
-	    pom {
-		name = 'hyperLib'
-		description = 'Enhancements to WPILib'
-		url = 'https://teamhyper.github.io/hyperLib'
-		developers {
-		    developer {
-			id = 'jhagborg'
-			name = 'James Hagborg'
-			email = '[email protected]'
-		    }
-		}
-		scm {
-		    url = 'https://github.com/teamhyper/hyperLib'
-		}
-	    }
-	}
+        mavenPublication(MavenPublication) {
+            from components.java
+            artifact sourcesJar {
+                classifier 'sources'
+            }
+            artifact javadocJar {
+                classifier 'javadoc'
+            }
+            
+            groupId 'org.hyperonline'
+            artifactId 'hyperlib'
+            
+            pom {
+                name = 'hyperLib'
+                description = 'Enhancements to WPILib'
+                url = 'https://teamhyper.github.io/hyperLib'
+                developers {
+                    developer {
+                        id = 'blucoat'
+                        name = 'James Hagborg'
+                        email = '[email protected]'
+                    }
+                }
+                scm {
+                    url = 'https://github.com/teamhyper/hyperLib'
+                }
+            }
+        }
     }
 }
 
@@ -104,5 +112,5 @@ checkstyle {
 }
 
 wrapper {
-    gradleVersion = 4.9
+    gradleVersion = '4.10.2'
 }

Dockerfile

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