Update to wpilib 2023 beta 7 (#607)

We now need platform specific jars -- reworks actions to support that. Currently only generates 32 bit pi images.
This commit is contained in:
shueja-personal
2022-12-16 17:05:23 -08:00
committed by GitHub
parent da1aabae3a
commit bb63af601d
198 changed files with 6339 additions and 4525 deletions

View File

@@ -8,6 +8,8 @@ apply plugin: "java"
sourceCompatibility = 11
wpilibTools.deps.wpilibVersion = wpilibVersion
dependencies {
// Jackson
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
@@ -22,19 +24,18 @@ dependencies {
implementation "org.apache.commons:commons-exec:1.3"
// WPILib deps
implementation "edu.wpi.first.wpiutil:wpiutil-java:$wpilibVersion"
implementation "edu.wpi.first.cameraserver:cameraserver-java:$wpilibVersion"
implementation wpilibTools.deps.wpilibJava("wpiutil")
implementation wpilibTools.deps.wpilibJava("cameraserver")
implementation wpilibTools.deps.wpilibJava("cscore")
implementation wpilibTools.deps.wpilibJava("wpinet")
implementation wpilibTools.deps.wpilibJava("wpimath")
implementation wpilibTools.deps.wpilibJava("ntcore")
implementation wpilibTools.deps.wpilibJava("hal")
implementation wpilibTools.deps.wpilibJava("wpilibj")
implementation "edu.wpi.first.cscore:cscore-java:$wpilibVersion"
jniPlatforms.each { implementation "edu.wpi.first.cscore:cscore-jni:$wpilibVersion:$it" }
implementation "edu.wpi.first.thirdparty.frc2023.opencv:opencv-java:$opencvVersion"
jniPlatforms.each { implementation "edu.wpi.first.thirdparty.frc2023.opencv:opencv-jni:$opencvVersion:$it" }
implementation "edu.wpi.first.ntcore:ntcore-java:$wpilibVersion"
jniPlatforms.each { implementation "edu.wpi.first.ntcore:ntcore-jni:$wpilibVersion:$it" }
implementation "edu.wpi.first.thirdparty.frc2022.opencv:opencv-java:$opencvVersion"
jniPlatforms.each { implementation "edu.wpi.first.thirdparty.frc2022.opencv:opencv-jni:$opencvVersion:$it" }
implementation "edu.wpi.first.wpimath:wpimath-java:2022.1.1"
implementation "org.ejml:ejml-simple:0.41"
// test stuff

View File

@@ -1,16 +1,16 @@
// Configure Native-Utils WPI Plugin
nativeUtils.addWpiNativeUtils()
nativeUtils.withRoboRIO()
nativeUtils.withRaspbian()
nativeUtils.withBionic()
nativeUtils.withCrossRoboRIO()
nativeUtils.withCrossLinuxArm32()
nativeUtils.withCrossLinuxArm64()
// Configure WPI dependencies.
nativeUtils.wpi.configureDependencies {
wpiVersion = wpilibVersion
wpimathVersion = wpilibVersion
niLibVersion = "2022.2.3"
opencvVersion = "4.5.2-1"
googleTestVersion = "1.9.0-5-437e100-1"
niLibVersion = "2023.2.0"
opencvVersion = "4.6.0-3"
googleTestVersion = "1.11.0-4"
imguiVersion = "1.86-1"
}

View File

@@ -0,0 +1,28 @@
task copyPhotonlib() {
doFirst {
// Assume publish to maven local has just be run. Kinda curst
// // first, invoke gradle to generate the vendor json
// try {
// exec {
// commandLine 'gradlew', 'photon-lib:generateVendorJson', '-x', "check"
// }
// } catch (Exception e) {
// // ignored
// }
def vendorJsonSrc = new File("${rootDir}", "../photon-lib/build/generated/vendordeps/");
def vendorJsonDst = new File("${projectDir}/vendordeps/");
delete(fileTree(vendorJsonDst) {
exclude '.gitignore'
})
println("Copying from ${vendorJsonSrc} to ${vendorJsonDst}")
copy {
from vendorJsonSrc
into vendorJsonDst
}
}
outputs.upToDateWhen { false }
}