From c5b42a119135512920accba4482471e71ced68ac Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 23 Oct 2023 23:28:37 -0400 Subject: [PATCH] Bump WPILib to beta 2 (#972) --------- Co-authored-by: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- photonlib-cpp-examples/aimandrange/build.gradle | 2 +- photonlib-cpp-examples/aimattarget/build.gradle | 2 +- photonlib-cpp-examples/apriltagExample/build.gradle | 2 +- photonlib-cpp-examples/build.gradle | 1 + photonlib-cpp-examples/getinrange/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- photonlib-java-examples/aimandrange/build.gradle | 2 +- photonlib-java-examples/aimattarget/build.gradle | 2 +- photonlib-java-examples/build.gradle | 1 + photonlib-java-examples/getinrange/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- photonlib-java-examples/simaimandrange/build.gradle | 2 +- .../swervedriveposeestsim/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- shared/common.gradle | 3 +++ shared/examples_common.gradle | 8 -------- 18 files changed, 19 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 199729e75a..f593638b90 100644 --- 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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f959b087a..24c4386e93 100644 --- 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 diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index ecedfafb40..c1c32d0284 100644 --- 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" } diff --git a/photonlib-cpp-examples/aimattarget/build.gradle b/photonlib-cpp-examples/aimattarget/build.gradle index ecedfafb40..c1c32d0284 100644 --- 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" } diff --git a/photonlib-cpp-examples/apriltagExample/build.gradle b/photonlib-cpp-examples/apriltagExample/build.gradle index ecedfafb40..c1c32d0284 100644 --- 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" } diff --git a/photonlib-cpp-examples/build.gradle b/photonlib-cpp-examples/build.gradle index 0d262a1504..f86d65a4ae 100644 --- 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 { diff --git a/photonlib-cpp-examples/getinrange/build.gradle b/photonlib-cpp-examples/getinrange/build.gradle index ecedfafb40..c1c32d0284 100644 --- 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" } diff --git a/photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties b/photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties index 7f959b087a..24c4386e93 100644 --- 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 diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 7d6e58895a..7dda3b59b0 100644 --- 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 diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle index d98e56b952..1442f184c9 100644 --- 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 diff --git a/photonlib-java-examples/build.gradle b/photonlib-java-examples/build.gradle index 35f533e690..68dd2983a2 100644 --- 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" diff --git a/photonlib-java-examples/getinrange/build.gradle b/photonlib-java-examples/getinrange/build.gradle index 7d6e58895a..7dda3b59b0 100644 --- 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 diff --git a/photonlib-java-examples/gradle/wrapper/gradle-wrapper.properties b/photonlib-java-examples/gradle/wrapper/gradle-wrapper.properties index 7f959b087a..24c4386e93 100644 --- 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 diff --git a/photonlib-java-examples/simaimandrange/build.gradle b/photonlib-java-examples/simaimandrange/build.gradle index 7d6e58895a..7dda3b59b0 100644 --- 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 diff --git a/photonlib-java-examples/swervedriveposeestsim/build.gradle b/photonlib-java-examples/swervedriveposeestsim/build.gradle index 424e9fa54a..d0be7323ec 100644 --- 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 diff --git a/photonlib-java-examples/swervedriveposeestsim/gradle/wrapper/gradle-wrapper.properties b/photonlib-java-examples/swervedriveposeestsim/gradle/wrapper/gradle-wrapper.properties index d3fb630184..ca8f28abd3 100644 --- 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 diff --git a/shared/common.gradle b/shared/common.gradle index e8181507e3..cb4ce3f80b 100644 --- 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 { diff --git a/shared/examples_common.gradle b/shared/examples_common.gradle index b908c64b5e..5212307f0f 100644 --- 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/");