diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index 5a23933e99..984952eb76 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "Beta2020", + "projectYear": "Beta2020-2", "teamNumber": 0 } diff --git a/build.gradle b/build.gradle index 9eec720e85..81b333fc73 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2' id 'edu.wpi.first.NativeUtils' apply false id 'edu.wpi.first.GradleJni' version '0.10.1' - id 'edu.wpi.first.GradleVsCode' version '0.10.0' + id 'edu.wpi.first.GradleVsCode' version '0.11.0' id 'idea' id 'visual-studio' id 'net.ltgt.errorprone' version '1.1.1' apply false diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 8069df0125..5176cb3163 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - implementation "edu.wpi.first:native-utils:2020.5.2" + implementation "edu.wpi.first:native-utils:2020.7.1" } diff --git a/hal/build.gradle b/hal/build.gradle index 1cad0753e2..d744259135 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -192,7 +192,7 @@ model { if (!(it instanceof NativeBinarySpec)) return if (it.component.name != 'hal' && it.component.name != 'halBase') return if (it.targetPlatform.name != nativeUtils.wpi.platforms.roborio) return - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared') } } } diff --git a/hal/src/main/native/athena/AddressableLED.cpp b/hal/src/main/native/athena/AddressableLED.cpp index 0d9dcc6d77..9ecc4c4b84 100644 --- a/hal/src/main/native/athena/AddressableLED.cpp +++ b/hal/src/main/native/athena/AddressableLED.cpp @@ -9,8 +9,6 @@ #include -#include - #include "ConstantsInternal.h" #include "DigitalInternal.h" #include "HALInitializer.h" diff --git a/myRobot/build.gradle b/myRobot/build.gradle index 012dea1cd0..8e4ec94213 100644 --- a/myRobot/build.gradle +++ b/myRobot/build.gradle @@ -148,7 +148,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } @@ -177,7 +177,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':cameraserver', library: 'cameraserver', linkage: 'static' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/shared/config.gradle b/shared/config.gradle index 9bf28ae89b..20ec083e08 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -8,7 +8,7 @@ nativeUtils { wpi { configureDependencies { wpiVersion = "-1" - niLibVersion = "2020.7.1" + niLibVersion = "2020.9.1" opencvVersion = "3.4.7-2" googleTestVersion = "1.9.0-3-437e100" imguiVersion = "1.72b-2" diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle index 3b097cee82..7622d0eef8 100644 --- a/shared/jni/setupBuild.gradle +++ b/shared/jni/setupBuild.gradle @@ -200,7 +200,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' } if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } @@ -235,7 +235,7 @@ model { if (!project.hasProperty('noWpiutil')) { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle index 235bb71a1f..af9b4c409b 100644 --- a/shared/plugins/setupBuild.gradle +++ b/shared/plugins/setupBuild.gradle @@ -57,7 +57,7 @@ if (!project.hasProperty('onlylinuxathena')) { } lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } else { it.buildable = false diff --git a/simulation/halsim_ds_socket/build.gradle b/simulation/halsim_ds_socket/build.gradle index ef7659d048..440e5d9abd 100644 --- a/simulation/halsim_ds_socket/build.gradle +++ b/simulation/halsim_ds_socket/build.gradle @@ -49,7 +49,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib library: pluginName, linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/simulation/lowfi_simulation/build.gradle b/simulation/lowfi_simulation/build.gradle index 9708ee6ed5..e6e81430bc 100644 --- a/simulation/lowfi_simulation/build.gradle +++ b/simulation/lowfi_simulation/build.gradle @@ -116,7 +116,7 @@ if (!project.hasProperty('onlylinuxathena')) { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib library: nativeName, linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } @@ -131,7 +131,7 @@ if (!project.hasProperty('onlylinuxathena')) { lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib library: nativeName, linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index c4ba6189c1..09f2a9547b 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -64,7 +64,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' } if ((it instanceof NativeExecutableBinarySpec || it instanceof GoogleTestTestSuiteBinarySpec) && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/wpilibOldCommands/build.gradle b/wpilibOldCommands/build.gradle index 66334adbfc..e6e061d60f 100644 --- a/wpilibOldCommands/build.gradle +++ b/wpilibOldCommands/build.gradle @@ -62,7 +62,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' } if ((it instanceof NativeExecutableBinarySpec || it instanceof GoogleTestTestSuiteBinarySpec) && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index 0ada5cefda..8730824523 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -155,7 +155,7 @@ model { lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' nativeUtils.useRequiredLibrary(it, 'opencv_shared') if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } @@ -205,7 +205,7 @@ model { nativeUtils.useRequiredLibrary(it, 'opencv_shared') lib library: nativeName, linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } } diff --git a/wpilibcExamples/build.gradle b/wpilibcExamples/build.gradle index 28e77fb069..12279df38f 100644 --- a/wpilibcExamples/build.gradle +++ b/wpilibcExamples/build.gradle @@ -93,7 +93,7 @@ model { lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared' } if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } sources { @@ -147,7 +147,7 @@ model { lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared' } if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } sources { diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index cc5ada83ba..ed6d58e9f3 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -55,7 +55,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } else { binary.sources { diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index a88282ed2e..cf6c4e5855 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -117,7 +117,7 @@ model { project(':hal').addHalDependency(it, 'shared') project(':hal').addHalJniDependency(it) if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { - nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared') + nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared') } } }