Bump OpenCV and GTest to 2019 dependencies (#1366)

azure-pipelines.yml

@@ -5,10 +5,6 @@
 
 resources:
   containers:
-  - container: ubuntu18
-    image: ubuntu:18.04
-  - container: wpilib2018
-    image: wpilib/roborio-cross-ubuntu:2018-17.10
   - container: wpilib2019
     image: wpilib/roborio-cross-ubuntu:2019-18.04
 
@@ -36,7 +32,7 @@ jobs:
    pool:
      vmImage: 'Ubuntu 16.04'
 
-   container: wpilib2018
+   container: wpilib2019
 
    steps:
     - task: Gradle@2
@@ -91,14 +87,22 @@ jobs:
    pool:
      vmImage: 'vs2017-win2016'
    steps:
+    - powershell: |
+        mkdir build
+        $ProgressPreference = 'SilentlyContinue'
+        wget "https://download.java.net/java/ga/jdk11/openjdk-11_windows-x64_bin.zip" -O "build\jdk.zip"
+      displayName: 'Download JDK'
+    - task: JavaToolInstaller@0
+      inputs:
+        jdkSourceOption: localDirectory
+        jdkFile: 'build/jdk.zip'
+        jdkDestinationDirectory: 'build/jdkinst'
+        jdkArchitectureOption: x64
     - task: Gradle@2
       inputs:
         workingDirectory: ''
         gradleWrapperFile: 'gradlew'
         gradleOptions: '-Xmx3072m'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.8'
-        jdkArchitectureOption: 'x64'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
         tasks: 'build'
@@ -109,14 +113,22 @@ jobs:
    pool:
      vmImage: 'vs2017-win2016'
    steps:
+    - powershell: |
+        mkdir build
+        $ProgressPreference = 'SilentlyContinue'
+        wget "https://github.com/wpilibsuite/frc-openjdk-windows/releases/download/v11.0.0u28-1/jdk-x86-11.0.0u28-1.zip" -O "build\jdk.zip"
+      displayName: 'Download JDK'
+    - task: JavaToolInstaller@0
+      inputs:
+        jdkSourceOption: localDirectory
+        jdkFile: 'build/jdk.zip'
+        jdkDestinationDirectory: 'build/jdkinst'
+        jdkArchitectureOption: x86
     - task: Gradle@2
       inputs:
         workingDirectory: ''
         gradleWrapperFile: 'gradlew'
         gradleOptions: '-Xmx1024m'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.8'
-        jdkArchitectureOption: 'x86'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
         tasks: 'build'
@@ -127,14 +139,19 @@ jobs:
    pool:
      vmImage: 'xcode9-macos10.13'
    steps:
+    - script: |
+        mkdir build
+        wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz"
+        sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
+        export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/
+      displayName: 'Setup JDK'
     - task: Gradle@2
       inputs:
         workingDirectory: ''
         gradleWrapperFile: 'gradlew'
         gradleOptions: '-Xmx3072m'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.8'
-        jdkArchitectureOption: 'x64'
+        javaHomeOption: 'path'
+        jdkDirectory: '/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
         tasks: 'build'

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'base'
     id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.2'
-    id 'edu.wpi.first.NativeUtils' version '1.7.5'
+    id 'edu.wpi.first.NativeUtils' version '1.7.7'
     id 'edu.wpi.first.GradleJni' version '0.3.0'
     id 'edu.wpi.first.GradleVsCode' version '0.4.2'
     id 'idea'

shared/googletest.gradle

@@ -1,7 +1,7 @@
 model {
     dependencyConfigs {
         googletest(DependencyConfig) {
-            groupId = 'edu.wpi.first.thirdparty.frc2018'
+            groupId = 'edu.wpi.first.thirdparty.frc2019'
             artifactId = 'googletest'
             headerClassifier = 'headers'
             ext = 'zip'

shared/opencv.gradle

@@ -2,13 +2,14 @@ if (project.hasProperty('useCpp') && project.useCpp) {
     model {
         dependencyConfigs {
             opencv(DependencyConfig) {
-                groupId = 'org.opencv'
+                groupId = 'edu.wpi.first.thirdparty.frc2019.opencv'
                 artifactId = 'opencv-cpp'
                 headerClassifier = 'headers'
                 ext = 'zip'
-                version = '3.2.0'
+                version = '3.4.3-7'
                 sharedConfigs = project.sharedCvConfigs
                 staticConfigs = project.staticCvConfigs
+                linkExcludes = ['**/*java*']
             }
         }
     }
@@ -16,12 +17,12 @@ if (project.hasProperty('useCpp') && project.useCpp) {
 
 if (project.hasProperty('useJava') && project.useJava) {
     dependencies {
-        compile 'org.opencv:opencv-java:3.2.0'
+        compile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7'
         if (!project.hasProperty('skipDev') || !project.skipDev) {
-            devCompile 'org.opencv:opencv-java:3.2.0'
+            devCompile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7'
         }
         if (project.hasProperty('useDocumentation') && project.useDocumentation) {
-            javaSource 'org.opencv:opencv-java:3.2.0:sources'
+            javaSource 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7:sources'
         }
     }
 }