Update for 2024.1.1-beta-1 (#675)

PeterJohnson · web-flow · commit a17c2dd56a17 · 2023-10-11T15:26:26.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ repositories {
 dependencies {
     api 'com.google.code.gson:gson:2.8.6'
 
-    api 'edu.wpi.first:native-utils:2024.2.0'
+    api 'edu.wpi.first:native-utils:2024.3.1'
 
     api 'de.undercouch:gradle-download-task:4.1.2'
 
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 2024.0.0-alpha-1
+version = 2024.1.1-beta-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
@@ -24,9 +24,9 @@
 public class WPIExtension {
     // WPILib (first.wpi.edu/FRC/roborio/maven) libs
 
-    private static final List<String> validImageVersions = List.of("2023_v3.*");
+    private static final List<String> validImageVersions = List.of("2024_v1.*");
 
-    private String jreArtifactLocation = "edu.wpi.first.jdk:roborio-2023:17.0.5u7-1";
+    private String jreArtifactLocation = "edu.wpi.first.jdk:roborio-2024:17.0.9u7-1";
 
     // WPILib (first.wpi.edu/FRC/roborio/maven) Utilities
 
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,24 @@
 
 public abstract class WPIVersionsExtension {
 
-    private static final String wpilibVersion = "2024.0.0-alpha-1";
-    private static final String niLibrariesVersion = "2023.3.0";
-    private static final String opencvVersion = "4.6.0-5";
-    private static final String imguiVersion = "1.89.1-2";
+    private static final String wpilibVersion = "2024.1.1-beta-1";
+    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.42";
-    private static final String jacksonVersion = "2.12.4";
-    private static final String wpimathVersion = "2024.0.0-alpha-1";
-    private static final String googleTestVersion = "1.12.1-2";
+    private static final String jacksonVersion = "2.15.2";
+    private static final String wpimathVersion = "2024.1.1-beta-1";
+    private static final String googleTestVersion = "1.14.0-1";
 
-    private static final String smartDashboardVersion = "2024.0.0-alpha-1";
-    private static final String shuffleboardVersion = "2024.0.0-alpha-1";
-    private static final String outlineViewerVersion = "2024.0.0-alpha-1";
-    private static final String robotBuilderVersion = "2024.0.0-alpha-1";
-    private static final String pathWeaverVersion = "2024.0.0-alpha-1";
-    private static final String glassVersion = "2024.0.0-alpha-1";
-    private static final String sysIdVersion = "2023.4.3";
-    private static final String roboRIOTeamNumberSetterVersion = "2024.0.0-alpha-1";
-    private static final String dataLogToolVersion = "2024.0.0-alpha-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";
 
 
     public abstract Property<String> getWpilibVersion();
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java
@@ -118,8 +118,8 @@ public WPINativeExtension(Project project, WPIExtension wpi, WPIVersionsExtensio
         // nte.setSinglePrintPerPlatform();
 
         nte.getWpi().configureDependencies(wpiDeps -> {
-            wpiDeps.getGoogleTestYear().set("frc2023");
-            wpiDeps.getOpencvYear().set("frc2023");
+            wpiDeps.getGoogleTestYear().set("frc2024");
+            wpiDeps.getOpencvYear().set("frc2024");
             wpiDeps.getWpiVersion().set(versions.getWpilibVersion());
             wpiDeps.getNiLibVersion().set(versions.getNiLibrariesVersion());
             wpiDeps.getOpencvVersion().set(versions.getOpencvVersion());
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
@@ -51,7 +51,7 @@ public WPIJavaDepsExtension(WPIVersionsExtension versions, ProviderFactory provi
         createJavaDependencies("edu.wpi.first.apriltag", "apriltag-java", versions.getWpilibVersion());
         createJavaDependencies("edu.wpi.first.wpiunits", "wpiunits-java", versions.getWpilibVersion());
 
-        createJavaDependencies("edu.wpi.first.thirdparty.frc2023.opencv", "opencv-java", versions.getOpencvVersion());
+        createJavaDependencies("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-java", versions.getOpencvVersion());
         createJavaDependencies("org.ejml", "ejml-simple", versions.getEjmlVersion());
 
         createJavaDependencies("com.fasterxml.jackson.core", "jackson-annotations", versions.getJacksonVersion());
@@ -81,7 +81,7 @@ private List<Provider<String>> getWpilibJniInternal(boolean debug, String platfo
             createJniDependency("edu.wpi.first.wpimath", "wpimath-cpp", versions.getWpimathVersion(), debug, platform),
             createJniDependency("edu.wpi.first.ntcore", "ntcore-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.cscore", "cscore-cpp", versions.getWpilibVersion(), debug, platform),
-            createJniDependency("edu.wpi.first.thirdparty.frc2023.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
+            createJniDependency("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
             createJniDependency("edu.wpi.first.wpinet", "wpinet-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.wpiutil", "wpiutil-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.apriltag", "apriltag-cpp", versions.getWpilibVersion(), debug, platform)
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.0.0-alpha-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 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.0.0-alpha-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 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.0.0-alpha-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 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.0.0-alpha-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
     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.0.0-alpha-1"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
 }
 
 def ROBOT_MAIN_CLASS = "frc.team0000.robot.MainKt"
diff --git a/versionupdates.gradle b/versionupdates.gradle
@@ -10,10 +10,10 @@ def versionMap = [
   sysIdVersion: 'edu.wpi.first.tools:SysId:+:windowsx86-64@zip',
   roboRIOTeamNumberSetterVersion: 'edu.wpi.first.tools:roboRIOTeamNumberSetter:+:windowsx86-64@zip',
   dataLogToolVersion: 'edu.wpi.first.tools:DataLogTool:+:windowsx86-64@zip',
-  opencvVersion: 'edu.wpi.first.thirdparty.frc2023.opencv:opencv-java:+',
-  googleTestVersion: 'edu.wpi.first.thirdparty.frc2023:googletest:+:headers',
+  opencvVersion: 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:+',
+  googleTestVersion: 'edu.wpi.first.thirdparty.frc2024:googletest:+:headers',
   niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip',
-  imguiVersion: 'edu.wpi.first.thirdparty.frc2023:imgui:+:headers',
+  imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers',
   wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+'
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = 2024.0.0-alpha-1`
	`1`	`+version = 2024.1.1-beta-1`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`plugins {`
`3`	`3`	`id "assembler"`
`4`		`- id "edu.wpi.first.GradleRIO" version "2024.0.0-alpha-1"`
	`4`	`+ id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`def projectFolder = project.buildFile.parentFile`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`plugins {`
`3`	`3`	`id "cpp"`
`4`	`4`	`id "google-test-test-suite"`
`5`		`- id "edu.wpi.first.GradleRIO" version "2024.0.0-alpha-1"`
	`5`	`+ id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`def projectFolder = project.buildFile.parentFile`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "java"`
`3`		`- id "edu.wpi.first.GradleRIO" version "2024.0.0-alpha-1"`
	`3`	`+ id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`def projectFolder = project.buildFile.parentFile`