Bump WPILib to beta 2 (#972)

--------- Co-authored-by: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
2026-06-19 00:41:41 +00:00 · 2023-10-23 23:28:37 -04:00
parent 959c162fc2
commit c5b42a1191
18 changed files with 19 additions and 22 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
 apply from: "versioningHelper.gradle"

 ext {
-    wpilibVersion = "2024.1.1-beta-1"
+    wpilibVersion = "2024.1.1-beta-2"
    openCVversion = "4.8.0-1"
    joglVersion = "2.4.0-rc-20200307"
    javalinVersion = "5.6.2"
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
+distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/photonlib-cpp-examples/aimandrange/build.gradle
+++ b/photonlib-cpp-examples/aimandrange/build.gradle
@@ -1,7 +1,7 @@
 plugins {
    id "cpp"
    id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"

    id "com.dorongold.task-tree" version "2.1.0"
 }
--- a/photonlib-cpp-examples/aimattarget/build.gradle
+++ b/photonlib-cpp-examples/aimattarget/build.gradle
@@ -1,7 +1,7 @@
 plugins {
    id "cpp"
    id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"

    id "com.dorongold.task-tree" version "2.1.0"
 }
--- a/photonlib-cpp-examples/apriltagExample/build.gradle
+++ b/photonlib-cpp-examples/apriltagExample/build.gradle
@@ -1,7 +1,7 @@
 plugins {
    id "cpp"
    id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"

    id "com.dorongold.task-tree" version "2.1.0"
 }
--- a/photonlib-cpp-examples/build.gradle
+++ b/photonlib-cpp-examples/build.gradle
@@ -1,5 +1,6 @@
 plugins {
    id "com.diffplug.spotless" version "6.1.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2" apply false
 }

 allprojects {
--- a/photonlib-cpp-examples/getinrange/build.gradle
+++ b/photonlib-cpp-examples/getinrange/build.gradle
@@ -1,7 +1,7 @@
 plugins {
    id "cpp"
    id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"

    id "com.dorongold.task-tree" version "2.1.0"
 }
--- a/photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties
+++ b/photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
+distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/photonlib-java-examples/aimandrange/build.gradle
+++ b/photonlib-java-examples/aimandrange/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"
 }

 sourceCompatibility = JavaVersion.VERSION_11
--- a/photonlib-java-examples/aimattarget/build.gradle
+++ b/photonlib-java-examples/aimattarget/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"
 }

 sourceCompatibility = JavaVersion.VERSION_11
--- a/photonlib-java-examples/build.gradle
+++ b/photonlib-java-examples/build.gradle
@@ -1,5 +1,6 @@
 plugins {
    id "com.diffplug.spotless" version "6.1.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2" apply false
 }

 apply from: "examples.gradle"
--- a/photonlib-java-examples/getinrange/build.gradle
+++ b/photonlib-java-examples/getinrange/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"
 }

 sourceCompatibility = JavaVersion.VERSION_11
--- a/photonlib-java-examples/gradle/wrapper/gradle-wrapper.properties
+++ b/photonlib-java-examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
+distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/photonlib-java-examples/simaimandrange/build.gradle
+++ b/photonlib-java-examples/simaimandrange/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"
 }

 sourceCompatibility = JavaVersion.VERSION_11
--- a/photonlib-java-examples/swervedriveposeestsim/build.gradle
+++ b/photonlib-java-examples/swervedriveposeestsim/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO"
 }

 sourceCompatibility = JavaVersion.VERSION_11
--- a/photonlib-java-examples/swervedriveposeestsim/gradle/wrapper/gradle-wrapper.properties
+++ b/photonlib-java-examples/swervedriveposeestsim/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
+distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=permwrapper/dists
--- a/shared/common.gradle
+++ b/shared/common.gradle
@@ -43,6 +43,9 @@ dependencies {

    // test stuff
    testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
+
+    // wpilib serde
+    implementation 'us.hebi.quickbuf:quickbuf-runtime:1.3.2'
 }

 test {
--- a/shared/examples_common.gradle
+++ b/shared/examples_common.gradle
@@ -1,14 +1,6 @@
 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/");