Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Update to 2022 native utils and gradle 7 (#3588)

Browse Source
This commit is contained in:
Thad House
2021-09-19 17:59:14 -07:00
committed by GitHub
parent 50198ffcf1
commit 179fde3a7b
34 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shared/java/javacommon.gradle
View File

@@ -118,7 +118,7 @@ dependencies {
task run(type: JavaExec) {
classpath = sourceSets.dev.runtimeClasspath
main = project.devMain
mainClass = project.devMain
}
build.dependsOn devClasses
@@ -129,7 +129,7 @@ jacoco {
jacocoTestReport {
reports {
xml.enabled true
html.enabled true
xml.required = true
html.required = true
}
}

4
shared/jni/setupBuild.gradle
View File

@@ -202,7 +202,7 @@ model {
lib project: ':wpiutil', library: 'wpiutilJNIShared', linkage: 'shared'
}
if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
}
}
}
@@ -237,7 +237,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', 'visa_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
}
}
}

2
shared/plugins/setupBuild.gradle
View File

@@ -62,7 +62,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', 'visa_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
}
} else {
it.buildable = false