Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update for 2025.0.0-alpha-2 #749

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Update for 2025.0.0-alpha-2 #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fac5d40
Update frcYear to 2025
PeterJohnson Sep 19, 2024
4f78150
Update for 2025.0.0-alpha-2
PeterJohnson Sep 19, 2024
bde9c69
Fix test extraction directory
PeterJohnson Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- uses: actions/download-artifact@v4
with:
name: Maven
path: ~/.m2/
path: ~/.m2/repository/

- name: Setup RoboRIO Toolchain
if: ${{ (matrix.language == 'cpp') || (matrix.language == 'asm') }}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = 2024.3.2
version = 2025.0.0-alpha-2
2 changes: 1 addition & 1 deletion src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public WPIExtension(Project project) {
platforms = new NativePlatforms();

frcYear = factory.property(String.class);
frcYear.convention("2024");
frcYear.convention("2025");

frcHome = factory.directoryProperty().fileProvider(project.provider(WPIExtension::computeHomeRoot))
.dir(frcYear);
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@

public abstract class WPIVersionsExtension {

private static final String wpilibVersion = "2024.3.2";
private static final String wpilibVersion = "2025.0.0-alpha-2";
private static final String niLibrariesVersion = "2024.2.1";
private static final String opencvVersion = "4.8.0-2";
private static final String opencvVersion = "4.8.0-4";
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 = "2024.3.2";
private static final String wpimathVersion = "2025.0.0-alpha-2";
private static final String googleTestVersion = "1.14.0-1";

private static final String smartDashboardVersion = "2024.3.2";
private static final String shuffleboardVersion = "2024.3.2";
private static final String outlineViewerVersion = "2024.3.2";
private static final String robotBuilderVersion = "2024.3.2";
private static final String pathWeaverVersion = "2024.3.2";
private static final String glassVersion = "2024.3.2";
private static final String sysIdVersion = "2024.3.2";
private static final String roboRIOTeamNumberSetterVersion = "2024.3.2";
private static final String dataLogToolVersion = "2024.3.2";
private static final String smartDashboardVersion = "2025.0.0-alpha-1";
private static final String shuffleboardVersion = "2025.0.0-alpha-2";
private static final String outlineViewerVersion = "2025.0.0-alpha-2";
private static final String robotBuilderVersion = "2025.0.0-alpha-2";
private static final String pathWeaverVersion = "2025.0.0-alpha-2";
private static final String glassVersion = "2025.0.0-alpha-2";
private static final String sysIdVersion = "2025.0.0-alpha-2";
private static final String roboRIOTeamNumberSetterVersion = "2025.0.0-alpha-2";
private static final String dataLogToolVersion = "2025.0.0-alpha-2";


public abstract Property<String> getWpilibVersion();
Expand Down
2 changes: 1 addition & 1 deletion testing/asm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

plugins {
id "assembler"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "edu.wpi.first.GradleRIO" version "2025.0.0-alpha-2"
}

def projectFolder = project.buildFile.parentFile
Expand Down
2 changes: 1 addition & 1 deletion testing/asm/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2025'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
2 changes: 1 addition & 1 deletion testing/cpp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "edu.wpi.first.GradleRIO" version "2025.0.0-alpha-2"
}

def projectFolder = project.buildFile.parentFile
Expand Down
2 changes: 1 addition & 1 deletion testing/cpp/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2024'
String frcYear = '2025'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
2 changes: 1 addition & 1 deletion testing/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "edu.wpi.first.GradleRIO" version "2025.0.0-alpha-2"
}

def projectFolder = project.buildFile.parentFile
Expand Down
2 changes: 1 addition & 1 deletion testing/java/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2024'
String frcYear = '2025'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
2 changes: 1 addition & 1 deletion testing/jni/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "cpp"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "edu.wpi.first.GradleRIO" version "2025.0.0-alpha-2"
id 'edu.wpi.first.GradleJni' version '0.10.1'
}

Expand Down
2 changes: 1 addition & 1 deletion testing/jni/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2024'
String frcYear = '2025'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
2 changes: 1 addition & 1 deletion testing/kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "org.jetbrains.kotlin.jvm" version "1.3.50"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "edu.wpi.first.GradleRIO" version "2025.0.0-alpha-2"
}

def ROBOT_MAIN_CLASS = "frc.team0000.robot.MainKt"
Expand Down
2 changes: 1 addition & 1 deletion testing/kotlin/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2025'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down