From 6b722c0b9e788fa5f324cee9c7c302b68fe4083f Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 19 Oct 2023 09:02:20 -0700 Subject: [PATCH 1/3] Loosen image version check (#681) The 2024 beta 1 image doesn't have an "FRC_" prefix. Also use name-capturing group for version. --- .../java/edu/wpi/first/gradlerio/deploy/roborio/RoboRIO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 7724301a..4ee4d0cd 100644 --- 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?_(?\\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; From d3c51b25d625cecbee529274751605c9a7cb686d Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 19 Oct 2023 21:35:15 -0700 Subject: [PATCH 2/3] Add quickbuf Java dependency (#682) --- .../java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java | 3 +++ .../edu/wpi/first/gradlerio/wpi/java/WPIJavaDepsExtension.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java index b876341e..37535ba0 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java @@ -12,6 +12,7 @@ public abstract class WPIVersionsExtension { 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 quickbufVersion = "1.3.2"; private static final String wpimathVersion = "2024.1.1-beta-1"; private static final String googleTestVersion = "1.14.0-1"; @@ -35,6 +36,7 @@ public abstract class WPIVersionsExtension { public abstract Property getEjmlVersion(); public abstract Property getJacksonVersion(); + public abstract Property getQuickbufVersion(); public abstract Property getSmartDashboardVersion(); public abstract Property getShuffleboardVersion(); public abstract Property 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 index e2c5e0f5..387313e5 100644 --- 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> wpilib() { From 98c2d57226417cd6001a068aaf18fecf78d10a35 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 20 Oct 2023 12:19:23 -0700 Subject: [PATCH 3/3] Update for 2024.1.1-beta-2 (#683) --- gradle.properties | 2 +- .../gradlerio/wpi/WPIVersionsExtension.java | 22 +++++++++---------- testing/asm/build.gradle | 2 +- testing/cpp/build.gradle | 2 +- testing/java/build.gradle | 2 +- testing/jni/build.gradle | 2 +- testing/kotlin/build.gradle | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 065e9be0..567f11b6 100644 --- 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/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java index 37535ba0..610f7d74 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java @@ -6,25 +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 quickbufVersion = "1.3.2"; - private static final String wpimathVersion = "2024.1.1-beta-1"; + 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 getWpilibVersion(); diff --git a/testing/asm/build.gradle b/testing/asm/build.gradle index 4050e6a8..74a6d3a7 100644 --- 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 index dc25da04..8ac32d1b 100644 --- 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 index 37f604a8..a749aedd 100644 --- 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 index 3630b946..366b780c 100644 --- 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 index 9c7f1ccb..6246caac 100644 --- 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"