Update stuff

PhotonVision · Nov 22, 2023 · bfb4612 · bfb4612
1 parent 0c80eff
commit bfb4612
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 63 deletions.
diff --git a/photon-core/build.gradle b/photon-core/build.gradle
@@ -1,38 +1,24 @@
-plugins {
-    id 'edu.wpi.first.WpilibTools' version '1.3.0'
-}
-
 import java.nio.file.Path
 
 apply from: "${rootDir}/shared/common.gradle"
 
 dependencies {
-    implementation project(':photon-targeting')
-
-    implementation "io.javalin:javalin:$javalinVersion"
-
-    implementation 'org.msgpack:msgpack-core:0.9.0'
-    implementation 'org.msgpack:jackson-dataformat-msgpack:0.9.0'
-
     // JOGL stuff (currently we only distribute for aarch64, which is Pi 4)
     implementation "org.jogamp.gluegen:gluegen-rt:$joglVersion"
     implementation "org.jogamp.jogl:jogl-all:$joglVersion"
-
     implementation "org.jogamp.gluegen:gluegen-rt:$joglVersion:natives-linux-aarch64"
     implementation "org.jogamp.jogl:jogl-all:$joglVersion:natives-linux-aarch64"
 
     // Zip
     implementation 'org.zeroturnaround:zt-zip:1.14'
 
-    implementation wpilibTools.deps.wpilibJava("apriltag")
-
     implementation "org.xerial:sqlite-jdbc:3.41.0.0"
 }
 
-task writeCurrentVersionJava {
+task writeCurrentVersion {
     def versionFileIn = file("${rootDir}/shared/PhotonVersion.java.in")
     writePhotonVersionFile(versionFileIn, Path.of("$projectDir", "src", "main", "java", "org", "photonvision", "PhotonVersion.java"),
             versionString)
 }
 
-build.dependsOn writeCurrentVersionJava
+build.dependsOn writeCurrentVersion
diff --git a/photon-server/build.gradle b/photon-server/build.gradle
@@ -6,32 +6,19 @@ plugins {
     id 'edu.wpi.first.WpilibTools' version '1.3.0'
 }
 
-evaluationDependsOn(':photon-core')
-
-mainClassName = 'org.photonvision.Main'
-
-group 'org.photonvision'
-version versionString + (project.hasProperty('pionly') ? "-raspi" : "")
-
 apply from: "${rootDir}/shared/common.gradle"
 
 dependencies {
     implementation project(':photon-core')
-    implementation project(':photon-targeting')
 
-    implementation "io.javalin:javalin:$javalinVersion"
     implementation "org.slf4j:slf4j-simple:2.0.7"
+}
 
-    implementation wpilibTools.deps.wpilibJava("wpiutil")
-    implementation wpilibTools.deps.wpilibJava("wpimath")
-    implementation wpilibTools.deps.wpilibJava("wpinet")
-    implementation wpilibTools.deps.wpilibJava("hal")
-    implementation wpilibTools.deps.wpilibJava("ntcore")
-    implementation wpilibTools.deps.wpilibJava("wpilibj")
-    implementation wpilibTools.deps.wpilibOpenCv("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get())
+group 'org.photonvision'
+version versionString + (project.hasProperty('pionly') ? "-raspi" : "")
 
-    implementation "org.msgpack:msgpack-core:0.9.0"
-    implementation "org.msgpack:jackson-dataformat-msgpack:0.9.0"
+application {
+    mainClass = 'org.photonvision.Main'
 }
 
 shadowJar {
@@ -43,7 +30,6 @@ shadowJar {
     ]
 }
 
-
 node {
     nodeProjectDir = file("${projectDir}/../photon-client")
 }
@@ -58,6 +44,10 @@ tasks.register("buildAndCopyUI") {
     finalizedBy "copyClientUIToResources"
 }
 
+run {
+    environment "PATH_PREFIX", "../"
+}
+
 run {
     if (project.hasProperty("profile")) {
         jvmArgs=[
@@ -70,7 +60,6 @@ run {
     }
 }
 
-
 remotes {
     pi {
         host = 'photonvision.local'
@@ -119,10 +108,6 @@ task findDeployTarget {
     }
 }
 
-run {
-    environment "PATH_PREFIX", "../"
-}
-
 task deploy {
     dependsOn findDeployTarget
     dependsOn assemble

diff --git a/shared/common.gradle b/shared/common.gradle
@@ -9,26 +9,14 @@ java {
 
 wpilibTools.deps.wpilibVersion = wpi.versions.wpilibVersion.get()
 
-def nativeConfigName = 'wpilibTestNative'
-def nativeConfig = configurations.create(nativeConfigName)
-
-def nativeTasks = wpilibTools.createExtractionTasks {
-    configurationName = nativeConfigName
-}
+dependencies {
+    implementation project(':photon-targeting')
 
-nativeTasks.addToSourceSetResources(sourceSets.main)
+    implementation "io.javalin:javalin:$javalinVersion"
 
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpimath")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpinet")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("ntcore")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("apriltag")
-nativeConfig.dependencies.add wpilibTools.deps.wpilib("hal")
-nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get())
+    implementation 'org.msgpack:msgpack-core:0.9.0'
+    implementation 'org.msgpack:jackson-dataformat-msgpack:0.9.0'
 
-dependencies {
-    // WPILib deps
     implementation wpilibTools.deps.wpilibJava("wpiutil")
     implementation wpilibTools.deps.wpilibJava("cameraserver")
     implementation wpilibTools.deps.wpilibJava("cscore")
@@ -40,12 +28,10 @@ dependencies {
     implementation wpilibTools.deps.wpilibJava("apriltag")
     implementation wpilibTools.deps.wpilibOpenCvJava("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get())
 
-    // Jackson
     implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: wpi.versions.jacksonVersion.get()
     implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: wpi.versions.jacksonVersion.get()
     implementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: wpi.versions.jacksonVersion.get()
 
-    // Apache commons
     implementation group: "org.apache.commons", name: "commons-lang3", version: "3.12.0"
     implementation group: "commons-io", name: "commons-io", version: "2.11.0"
     implementation group: "commons-cli", name: "commons-cli", version: "1.5.0"
@@ -55,10 +41,9 @@ dependencies {
     implementation group: "org.ejml", name: "ejml-simple", version: wpi.versions.ejmlVersion.get()
     implementation group: "us.hebi.quickbuf", name: "quickbuf-runtime", version: wpi.versions.quickbufVersion.get();
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
-
-    // wpilib serde
-    implementation 'us.hebi.quickbuf:quickbuf-runtime:1.3.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
 }
 
 test {