From c95feb29cef6b03e406bfde0a988b82009a3bbaa Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 20 Oct 2023 18:57:54 -0400 Subject: [PATCH 1/4] Bump to beta 2 --- build.gradle | 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/getinrange/build.gradle | 2 +- photonlib-java-examples/aimandrange/build.gradle | 2 +- photonlib-java-examples/aimattarget/build.gradle | 2 +- photonlib-java-examples/getinrange/build.gradle | 2 +- photonlib-java-examples/simaimandrange/build.gradle | 2 +- photonlib-java-examples/swervedriveposeestsim/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 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/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index ecedfafb40..758d419773 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" version "2024.1.1-beta-2" 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..758d419773 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" version "2024.1.1-beta-2" 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..758d419773 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" version "2024.1.1-beta-2" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-cpp-examples/getinrange/build.gradle b/photonlib-cpp-examples/getinrange/build.gradle index ecedfafb40..758d419773 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" version "2024.1.1-beta-2" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 7d6e58895a..21bf49feb0 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" version "2024.1.1-beta-2" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle index d98e56b952..6d2ef660c1 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" version "2024.1.1-beta-2" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/getinrange/build.gradle b/photonlib-java-examples/getinrange/build.gradle index 7d6e58895a..21bf49feb0 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" version "2024.1.1-beta-2" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/simaimandrange/build.gradle b/photonlib-java-examples/simaimandrange/build.gradle index 7d6e58895a..21bf49feb0 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" version "2024.1.1-beta-2" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/swervedriveposeestsim/build.gradle b/photonlib-java-examples/swervedriveposeestsim/build.gradle index 424e9fa54a..3d15af12d1 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" version "2024.1.1-beta-2" } sourceCompatibility = JavaVersion.VERSION_11 From 397d28d46cf0dce9825e933b8175b3943167fba6 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 20 Oct 2023 19:27:58 -0400 Subject: [PATCH 2/4] Reduce copy paste spam going forwards --- 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 +- 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 +- photonlib-java-examples/simaimandrange/build.gradle | 2 +- .../swervedriveposeestsim/build.gradle | 2 +- shared/common.gradle | 3 +++ shared/examples_common.gradle | 8 -------- 13 files changed, 14 insertions(+), 17 deletions(-) diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index 758d419773..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-2" + 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 758d419773..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-2" + 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 758d419773..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-2" + 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 758d419773..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-2" + id "edu.wpi.first.GradleRIO" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 21bf49feb0..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-2" + 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 6d2ef660c1..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-2" + 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 21bf49feb0..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-2" + id "edu.wpi.first.GradleRIO" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/simaimandrange/build.gradle b/photonlib-java-examples/simaimandrange/build.gradle index 21bf49feb0..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-2" + 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 3d15af12d1..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-2" + id "edu.wpi.first.GradleRIO" } sourceCompatibility = JavaVersion.VERSION_11 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/"); From 2d5ccd6715b0bed3acf5abde804c3a5ffaf10e4e Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 20 Oct 2023 19:29:53 -0400 Subject: [PATCH 3/4] Bump gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../apriltagExample/simgui-window.json | 14 +++++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) 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/apriltagExample/simgui-window.json b/photonlib-cpp-examples/apriltagExample/simgui-window.json index 79d676b16b..0f521f36e0 100644 --- a/photonlib-cpp-examples/apriltagExample/simgui-window.json +++ b/photonlib-cpp-examples/apriltagExample/simgui-window.json @@ -10,8 +10,8 @@ "style": "0", "userScale": "2", "width": "1652", - "xpos": "268", - "ypos": "82" + "xpos": "568", + "ypos": "336" } }, "Table": { @@ -30,12 +30,12 @@ "###FMS": { "Collapsed": "0", "Pos": "36,663", - "Size": "283,146" + "Size": "336,164" }, "###Joysticks": { "Collapsed": "0", "Pos": "373,500", - "Size": "796,206" + "Size": "976,239" }, "###Keyboard 0 Settings": { "Collapsed": "0", @@ -60,12 +60,12 @@ "###System Joysticks": { "Collapsed": "0", "Pos": "5,350", - "Size": "192,218" + "Size": "232,254" }, "###Timing": { "Collapsed": "0", "Pos": "5,150", - "Size": "135,127" + "Size": "162,142" }, "Debug##Default": { "Collapsed": "0", @@ -75,7 +75,7 @@ "Robot State": { "Collapsed": "0", "Pos": "5,20", - "Size": "92,99" + "Size": "109,114" } } } 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/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/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 From 270fd37072d4340905e4d11c288dbaa376891856 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 21 Oct 2023 10:58:37 -0400 Subject: [PATCH 4/4] oops --- .../apriltagExample/simgui-window.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/photonlib-cpp-examples/apriltagExample/simgui-window.json b/photonlib-cpp-examples/apriltagExample/simgui-window.json index 0f521f36e0..79d676b16b 100644 --- a/photonlib-cpp-examples/apriltagExample/simgui-window.json +++ b/photonlib-cpp-examples/apriltagExample/simgui-window.json @@ -10,8 +10,8 @@ "style": "0", "userScale": "2", "width": "1652", - "xpos": "568", - "ypos": "336" + "xpos": "268", + "ypos": "82" } }, "Table": { @@ -30,12 +30,12 @@ "###FMS": { "Collapsed": "0", "Pos": "36,663", - "Size": "336,164" + "Size": "283,146" }, "###Joysticks": { "Collapsed": "0", "Pos": "373,500", - "Size": "976,239" + "Size": "796,206" }, "###Keyboard 0 Settings": { "Collapsed": "0", @@ -60,12 +60,12 @@ "###System Joysticks": { "Collapsed": "0", "Pos": "5,350", - "Size": "232,254" + "Size": "192,218" }, "###Timing": { "Collapsed": "0", "Pos": "5,150", - "Size": "162,142" + "Size": "135,127" }, "Debug##Default": { "Collapsed": "0", @@ -75,7 +75,7 @@ "Robot State": { "Collapsed": "0", "Pos": "5,20", - "Size": "109,114" + "Size": "92,99" } } }