More version bumps

PhotonVision · Oct 15, 2023 · 1d76727 · 1d76727
1 parent 2a66940
commit 1d76727
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 51 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -106,14 +106,14 @@ jobs:
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew buildAllExamples -x check --max-workers 2
+          ./gradlew build -x check --max-workers 2
 
       - name: Build C++ examples
         working-directory: photonlib-cpp-examples
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew buildAllExamples -x check --max-workers 2
+          ./gradlew build -x check --max-workers 2
   photon-build-all:
     # The type of runner that the job will run on.
     runs-on: ubuntu-22.04

diff --git a/photon-lib/src/generate/photonlib.json.in b/photon-lib/src/generate/photonlib.json.in
@@ -2,7 +2,8 @@
   "fileName": "photonlib.json",
   "name": "photonlib",
   "version": "${photon_version}",
-  "uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004 ",
+  "uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
+  "frcYear": "2024",
   "mavenUrls": [
     "https://maven.photonvision.org/repository/internal",
     "https://maven.photonvision.org/repository/snapshots"

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

diff --git a/photonlib-cpp-examples/aimandrange/settings.gradle b/photonlib-cpp-examples/aimandrange/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-cpp-examples/aimandrange/src/main/include/Robot.h b/photonlib-cpp-examples/aimandrange/src/main/include/Robot.h
@@ -53,11 +53,11 @@ class Robot : public frc::TimedRobot {
   // PID constants should be tuned per robot
   const double LINEAR_P = 0.1;
   const double LINEAR_D = 0.0;
-  frc2::PIDController forwardController{LINEAR_P, 0.0, LINEAR_D};
+  frc::PIDController forwardController{LINEAR_P, 0.0, LINEAR_D};
 
   const double ANGULAR_P = 0.1;
   const double ANGULAR_D = 0.0;
-  frc2::PIDController turnController{ANGULAR_P, 0.0, ANGULAR_D};
+  frc::PIDController turnController{ANGULAR_P, 0.0, ANGULAR_D};
 
   // Change this to match the name of your camera
   photonlib::PhotonCamera camera{"photonvision"};

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

diff --git a/photonlib-cpp-examples/aimattarget/settings.gradle b/photonlib-cpp-examples/aimattarget/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-cpp-examples/aimattarget/src/main/include/Robot.h b/photonlib-cpp-examples/aimattarget/src/main/include/Robot.h
@@ -42,7 +42,7 @@ class Robot : public frc::TimedRobot {
   // Change this to match the name of your camera
   photonlib::PhotonCamera camera{"photonvision"};
   // PID constants should be tuned per robot
-  frc2::PIDController controller{.1, 0, 0};
+  frc::PIDController controller{.1, 0, 0};
 
   frc::XboxController xboxController{0};
 

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

diff --git a/photonlib-cpp-examples/apriltagExample/settings.gradle b/photonlib-cpp-examples/apriltagExample/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-cpp-examples/apriltagExample/src/main/include/Drivetrain.h b/photonlib-cpp-examples/apriltagExample/src/main/include/Drivetrain.h
@@ -109,8 +109,8 @@ class Drivetrain {
   frc::Encoder m_leftEncoder{0, 1};
   frc::Encoder m_rightEncoder{2, 3};
 
-  frc2::PIDController m_leftPIDController{8.5, 0.0, 0.0};
-  frc2::PIDController m_rightPIDController{8.5, 0.0, 0.0};
+  frc::PIDController m_leftPIDController{8.5, 0.0, 0.0};
+  frc::PIDController m_rightPIDController{8.5, 0.0, 0.0};
 
   frc::AnalogGyro m_gyro{0};
 

diff --git a/photonlib-cpp-examples/build.gradle b/photonlib-cpp-examples/build.gradle
@@ -28,10 +28,3 @@ spotless {
 }
 
 apply from: "examples.gradle"
-
-// Task that depends on the build task for every example
-task buildAllExamples { task ->
-    exampleFolderNames.each { line ->
-        task.dependsOn(line + ":build")
-    }
-}
diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

diff --git a/photonlib-cpp-examples/getinrange/settings.gradle b/photonlib-cpp-examples/getinrange/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-cpp-examples/getinrange/src/main/include/Robot.h b/photonlib-cpp-examples/getinrange/src/main/include/Robot.h
@@ -53,7 +53,7 @@ class Robot : public frc::TimedRobot {
   // PID constants should be tuned per robot
   const double P_GAIN = 0.1;
   const double D_GAIN = 0.0;
-  frc2::PIDController controller{P_GAIN, 0.0, D_GAIN};
+  frc::PIDController controller{P_GAIN, 0.0, D_GAIN};
 
   // Change this to match the name of your camera
   photonlib::PhotonCamera camera{"photonvision"};

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

diff --git a/photonlib-java-examples/aimandrange/settings.gradle b/photonlib-java-examples/aimandrange/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

diff --git a/photonlib-java-examples/aimattarget/settings.gradle b/photonlib-java-examples/aimattarget/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-java-examples/build.gradle b/photonlib-java-examples/build.gradle
@@ -28,10 +28,3 @@ spotless {
         targetExclude("photon-lib/src/main/java/org/photonvision/PhotonVersion.java")
     }
 }
-
-// Task that depends on the build task for every example
-task buildAllExamples { task ->
-    exampleFolderNames.each { line ->
-        task.dependsOn(line + ":build")
-    }
-}
diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

diff --git a/photonlib-java-examples/getinrange/settings.gradle b/photonlib-java-examples/getinrange/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

diff --git a/photonlib-java-examples/simaimandrange/settings.gradle b/photonlib-java-examples/simaimandrange/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git 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 "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

diff --git a/photonlib-java-examples/swervedriveposeestsim/settings.gradle b/photonlib-java-examples/swervedriveposeestsim/settings.gradle
@@ -4,7 +4,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2023'
+        String frcYear = '2024'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

diff --git a/photonlib-java-examples/swervedriveposeestsim/src/main/java/frc/robot/Constants.java b/photonlib-java-examples/swervedriveposeestsim/src/main/java/frc/robot/Constants.java
@@ -46,16 +46,7 @@ public static class Vision {
                 new Transform3d(new Translation3d(0.5, 0.0, 0.5), new Rotation3d(0, 0, 0));
 
         // The layout of the AprilTags on the field
-        public static final AprilTagFieldLayout kTagLayout;
-
-        static {
-            try {
-                kTagLayout = AprilTagFields.kDefaultField.loadAprilTagLayoutField();
-            } catch (IOException e) {
-                e.printStackTrace();
-                throw new RuntimeException(e);
-            }
-        }
+        public static final AprilTagFieldLayout kTagLayout = AprilTagFields.kDefaultField.loadAprilTagLayoutField();
 
         // The standard deviations of our vision estimated poses, which affect correction rate
         // (Fake values. Experiment and determine estimation noise on an actual robot.)