From d186be7f5c804f3e0993d193e2bc8bfdc44d118d Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 31 Dec 2024 22:45:12 -0800 Subject: [PATCH] Update for 2025.1.1 (#771) Update image version to 2025_v2.x --- gradle.properties | 2 +- .../wpi/first/gradlerio/wpi/WPIExtension.java | 2 +- .../gradlerio/wpi/WPIVersionsExtension.java | 24 +++++++++---------- testing/asm/build.gradle | 2 +- testing/cpp/build.gradle | 2 +- testing/java/build.gradle | 2 +- testing/jni/build.gradle | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6633d4b5..169dbfb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version = 2025.1.1-beta-3 +version = 2025.1.1 diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java index 0bcf2bdd..3f4c52d9 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java @@ -29,7 +29,7 @@ public class WPIExtension { // WPILib (first.wpi.edu/FRC/roborio/maven) libs - private static final List validImageVersions = List.of("2025_v1.*"); + private static final List validImageVersions = List.of("2025_v2.*"); private String jreArtifactLocation = "edu.wpi.first.jdk:roborio-2024:17.0.9u7-3"; 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 bc2f08e7..8cd34e41 100644 --- 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,24 @@ public abstract class WPIVersionsExtension { - private static final String wpilibVersion = "2025.1.1-beta-3"; - private static final String niLibrariesVersion = "2025.0.0"; + private static final String wpilibVersion = "2025.1.1"; + private static final String niLibrariesVersion = "2025.2.0"; private static final String opencvVersion = "4.10.0-3"; 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.3"; - private static final String wpimathVersion = "2025.1.1-beta-3"; + private static final String wpimathVersion = "2025.1.1"; - private static final String smartDashboardVersion = "2025.1.1-beta-3"; - private static final String shuffleboardVersion = "2025.1.1-beta-3"; - private static final String outlineViewerVersion = "2025.1.1-beta-3"; - private static final String robotBuilderVersion = "2025.1.1-beta-3"; - private static final String pathWeaverVersion = "2025.1.1-beta-3"; - private static final String glassVersion = "2025.1.1-beta-3"; - private static final String sysIdVersion = "2025.1.1-beta-3"; - private static final String roboRIOTeamNumberSetterVersion = "2025.1.1-beta-3"; - private static final String dataLogToolVersion = "2025.1.1-beta-3"; + private static final String smartDashboardVersion = "2025.1.1"; + private static final String shuffleboardVersion = "2025.1.1"; + private static final String outlineViewerVersion = "2025.1.1"; + private static final String robotBuilderVersion = "2025.1.1"; + private static final String pathWeaverVersion = "2025.1.1"; + private static final String glassVersion = "2025.1.1"; + private static final String sysIdVersion = "2025.1.1"; + private static final String roboRIOTeamNumberSetterVersion = "2025.1.1"; + private static final String dataLogToolVersion = "2025.1.1"; private static final String wpicalToolVersion = "2025.1.1"; diff --git a/testing/asm/build.gradle b/testing/asm/build.gradle index 327fca09..16f4cb16 100644 --- a/testing/asm/build.gradle +++ b/testing/asm/build.gradle @@ -1,7 +1,7 @@ plugins { id "assembler" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" + id "edu.wpi.first.GradleRIO" version "2025.1.1" } def projectFolder = project.buildFile.parentFile diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index e7ced839..5196842c 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 "2025.1.1-beta-3" + id "edu.wpi.first.GradleRIO" version "2025.1.1" } def projectFolder = project.buildFile.parentFile diff --git a/testing/java/build.gradle b/testing/java/build.gradle index f7a80fb7..180a2e75 100644 --- a/testing/java/build.gradle +++ b/testing/java/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" + id "edu.wpi.first.GradleRIO" version "2025.1.1" } def projectFolder = project.buildFile.parentFile diff --git a/testing/jni/build.gradle b/testing/jni/build.gradle index a8e184b6..580e88f9 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 "2025.1.1-beta-3" + id "edu.wpi.first.GradleRIO" version "2025.1.1" id 'edu.wpi.first.GradleJni' version '0.10.1' }