Upgrade to Gradle 7.2 and WPILib 2022 (#316)

This commit is contained in:
Tyler Veness
2021-11-21 17:22:56 -08:00
committed by GitHub
parent ffe34f00fe
commit 5ca39e7f84
316 changed files with 671 additions and 1019 deletions

View File

@@ -6,25 +6,44 @@ apply plugin: "edu.wpi.first.NativeUtils"
apply from: "${rootDir}/shared/config.gradle"
// Configure wpigui, libglass, libglassnt.
nativeUtils {
dependencyConfigs {
gui {
groupId = "edu.wpi.first.halsim"
artifactId = "halsim_gui"
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = wpilibVersion
sharedPlatforms << "osxx86-64" << "linuxx86-64" << "windowsx86-64"
}
nativeDependencyContainer {
wpigui(getNativeDependencyTypeClass('WPIStaticMavenDependency')) {
groupId = "edu.wpi.first.wpigui"
artifactId = "wpigui-cpp"
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = wpilibVersion
targetPlatforms.addAll(nativeUtils.wpi.platforms.desktopPlatforms)
}
combinedDependencyConfigs {
halsim_gui {
libraryName = "halsim_gui"
targetPlatforms << "osxx86-64" << "linuxx86-64" << "windowsx86-64"
dependencies << "gui_shared"
}
libglass(getNativeDependencyTypeClass('WPIStaticMavenDependency')) {
groupId = "edu.wpi.first.glass"
artifactId = "libglass"
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = wpilibVersion
targetPlatforms.addAll(nativeUtils.wpi.platforms.desktopPlatforms)
}
libglassnt(getNativeDependencyTypeClass('WPIStaticMavenDependency')) {
groupId = "edu.wpi.first.glass"
artifactId = "libglassnt"
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = wpilibVersion
targetPlatforms.addAll(nativeUtils.wpi.platforms.desktopPlatforms)
}
// Combined
gui(getNativeDependencyTypeClass('AllPlatformsCombinedNativeDependency')) {
dependencies = [
"libglassnt", "libglass", "wpigui", "imgui_static",
"wpimath_static", "ntcore_static", "wpiutil_static"]
}
}
}
ext {
@@ -42,11 +61,10 @@ dependencies {
implementation "edu.wpi.first.wpiutil:wpiutil-java:$wpilibVersion"
implementation "edu.wpi.first.wpimath:wpimath-java:$wpilibVersion"
implementation "edu.wpi.first.hal:hal-java:$wpilibVersion"
implementation "org.ejml:ejml-simple:0.38"
implementation "com.fasterxml.jackson.core:jackson-annotations:2.10.0"
implementation "com.fasterxml.jackson.core:jackson-core:2.10.0"
implementation "com.fasterxml.jackson.core:jackson-databind:2.10.0"
implementation "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:3.4.7-3"
implementation "edu.wpi.first.thirdparty.frc2022.opencv:opencv-java:$opencvVersion"
}
model {
@@ -67,10 +85,6 @@ model {
binaries.all { binary ->
nativeUtils.useRequiredLibrary(binary, "wpilib_executable_shared")
nativeUtils.useRequiredLibrary(binary, "opencv_shared")
if (binary.targetPlatform.name == NativePlatforms.desktop) {
nativeUtils.useRequiredLibrary(binary, "halsim_gui")
}
}
}
}