Merge branch 'main' into onedrive-fix

wpilibsuite · Oct 21, 2023 · cd1603f · cd1603f
2 parents 1e04d0d + 98c2d57
commit cd1603f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 2024.1.1-beta-1
+version = 2024.1.1-beta-2
diff --git a/src/main/java/edu/wpi/first/gradlerio/deploy/roborio/RoboRIO.java b/src/main/java/edu/wpi/first/gradlerio/deploy/roborio/RoboRIO.java
@@ -125,7 +125,7 @@ private boolean verifyOnlyIf(DeployContext ctx) {
 
     private void readAndVerifyImage(DeployContext context) {
         final String imageFile = "/etc/natinst/share/scs_imagemetadata.ini";
-        final Pattern pattern = Pattern.compile("^IMAGEVERSION\\s*=\\s*\\\"FRC_roboRIO2?_(\\d{4}_v\\d+(?:\\.\\d+)?)\\\"");
+        final Pattern pattern = Pattern.compile("^IMAGEVERSION\\s*=\\s*\\\"(FRC_)?roboRIO2?_(?<version>\\d{4}_v\\d+(?:\\.\\d+)?)\\\"");
 
         String content = context.execute("cat " + imageFile).getResult();
         log.info("Received Image File: ");
@@ -136,7 +136,7 @@ private void readAndVerifyImage(DeployContext context) {
             log.info(line);
             Matcher matcher = pattern.matcher(line.trim());
             if (matcher.matches()) {
-                String imageGroup = matcher.group(1);
+                String imageGroup = matcher.group("version");
                 log.info("Matched version: " + imageGroup);
                 verifyImageVersion(imageGroup);
                 imageFound = true;

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
@@ -6,24 +6,25 @@
 
 public abstract class WPIVersionsExtension {
 
-    private static final String wpilibVersion = "2024.1.1-beta-1";
+    private static final String wpilibVersion = "2024.1.1-beta-2";
     private static final String niLibrariesVersion = "2024.1.1";
     private static final String opencvVersion = "4.8.0-1";
     private static final String imguiVersion = "1.89.9-1";
     private static final String ejmlVersion = "0.43.1";
     private static final String jacksonVersion = "2.15.2";
-    private static final String wpimathVersion = "2024.1.1-beta-1";
+    private static final String quickbufVersion = "1.3.2";
+    private static final String wpimathVersion = "2024.1.1-beta-2";
     private static final String googleTestVersion = "1.14.0-1";
 
-    private static final String smartDashboardVersion = "2024.1.1-beta-1";
-    private static final String shuffleboardVersion = "2024.1.1-beta-1";
-    private static final String outlineViewerVersion = "2024.1.1-beta-1";
-    private static final String robotBuilderVersion = "2024.1.1-beta-1";
-    private static final String pathWeaverVersion = "2024.1.1-beta-1";
-    private static final String glassVersion = "2024.1.1-beta-1";
-    private static final String sysIdVersion = "2024.1.1-beta-1";
-    private static final String roboRIOTeamNumberSetterVersion = "2024.1.1-beta-1";
-    private static final String dataLogToolVersion = "2024.1.1-beta-1";
+    private static final String smartDashboardVersion = "2024.1.1-beta-2";
+    private static final String shuffleboardVersion = "2024.1.1-beta-2";
+    private static final String outlineViewerVersion = "2024.1.1-beta-2";
+    private static final String robotBuilderVersion = "2024.1.1-beta-2";
+    private static final String pathWeaverVersion = "2024.1.1-beta-2";
+    private static final String glassVersion = "2024.1.1-beta-2";
+    private static final String sysIdVersion = "2024.1.1-beta-2";
+    private static final String roboRIOTeamNumberSetterVersion = "2024.1.1-beta-2";
+    private static final String dataLogToolVersion = "2024.1.1-beta-2";
 
 
     public abstract Property<String> getWpilibVersion();
@@ -35,6 +36,7 @@ public abstract class WPIVersionsExtension {
 
     public abstract Property<String> getEjmlVersion();
     public abstract Property<String> getJacksonVersion();
+    public abstract Property<String> getQuickbufVersion();
     public abstract Property<String> getSmartDashboardVersion();
     public abstract Property<String> getShuffleboardVersion();
     public abstract Property<String> getOutlineViewerVersion();
@@ -56,6 +58,7 @@ public WPIVersionsExtension() {
 
         getEjmlVersion().convention(ejmlVersion);
         getJacksonVersion().convention(jacksonVersion);
+        getQuickbufVersion().convention(quickbufVersion);
         getSmartDashboardVersion().convention(smartDashboardVersion);
         getShuffleboardVersion().convention(shuffleboardVersion);
         getOutlineViewerVersion().convention(outlineViewerVersion);

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/java/WPIJavaDepsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/java/WPIJavaDepsExtension.java
@@ -57,6 +57,8 @@ public WPIJavaDepsExtension(WPIVersionsExtension versions, ProviderFactory provi
         createJavaDependencies("com.fasterxml.jackson.core", "jackson-annotations", versions.getJacksonVersion());
         createJavaDependencies("com.fasterxml.jackson.core", "jackson-core", versions.getJacksonVersion());
         createJavaDependencies("com.fasterxml.jackson.core", "jackson-databind", versions.getJacksonVersion());
+
+        createJavaDependencies("us.hebi.quickbuf", "quickbuf-runtime", versions.getQuickbufVersion());
     }
 
     public List<Provider<String>> wpilib() {

diff --git a/testing/asm/build.gradle b/testing/asm/build.gradle
@@ -1,7 +1,7 @@
 
 plugins {
     id "assembler"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle
@@ -2,7 +2,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"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/java/build.gradle b/testing/java/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"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/jni/build.gradle b/testing/jni/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
     id "cpp"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2"
     id 'edu.wpi.first.GradleJni' version '0.10.1'
 }
 

diff --git a/testing/kotlin/build.gradle b/testing/kotlin/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.3.50"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2"
 }
 
 def ROBOT_MAIN_CLASS = "frc.team0000.robot.MainKt"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version = 2024.1.1-beta-1
		version = 2024.1.1-beta-2