Skip to content

Commit

Permalink
Update to WPILib 2024 Beta
Browse files Browse the repository at this point in the history
  • Loading branch information
itsmeft24 committed Jan 2, 2024
1 parent 1436875 commit 99f611a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 24 deletions.
29 changes: 15 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ plugins {
id 'cpp'
id 'java'
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
id 'edu.wpi.first.NativeUtils' version '2023.11.1'
id 'edu.wpi.first.GradleJni' version '1.0.0'
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
id 'edu.wpi.first.NativeUtils' version '2024.6.1'
id 'edu.wpi.first.GradleJni' version '1.1.0'
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
}

repositories {
Expand All @@ -21,19 +21,20 @@ apply from: 'config.gradle'

// Apply Java configuration
dependencies {
implementation 'edu.wpi.first.cscore:cscore-java:2023.+'
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2023.+'
implementation 'edu.wpi.first.ntcore:ntcore-java:2023.+'
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2023.+'
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2023.+'
implementation 'edu.wpi.first.wpimath:wpimath-java:2023.+'
implementation 'edu.wpi.first.wpilibNewCommands:wpilibNewCommands-java:2023.+'
implementation 'edu.wpi.first.hal:hal-java:2023.+'
implementation "org.ejml:ejml-simple:0.41"
implementation 'edu.wpi.first.cscore:cscore-java:2024.+'
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2024.+'
implementation 'edu.wpi.first.ntcore:ntcore-java:2024.+'
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2024.+'
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2024.+'
implementation 'edu.wpi.first.wpimath:wpimath-java:2024.+'
implementation 'edu.wpi.first.wpilibNewCommands:wpilibNewCommands-java:2024.+'
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2024.+'
implementation 'edu.wpi.first.hal:hal-java:2024.+'
implementation "org.ejml:ejml-simple:0.43.1"
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"
implementation "com.fasterxml.jackson.core:jackson-databind:2.12.4"
implementation 'edu.wpi.first.thirdparty.frc2023.opencv:opencv-java:4.6.0-2'
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-2'
}

// Set up exports properly
Expand Down Expand Up @@ -67,5 +68,5 @@ model {
apply from: 'publish.gradle'

wrapper {
gradleVersion '7.5.1'
gradleVersion '8.4'
}
9 changes: 5 additions & 4 deletions config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ nativeUtils.withCrossRoboRIO()
nativeUtils {
wpi {
configureDependencies {
wpiVersion = "2023.+"
niLibVersion = "2023.3.0"
opencvVersion = "4.6.0-3"
wpimathVersion = "2023.+"
wpiVersion = "2024.+"
opencvYear = "frc2024"
niLibVersion = "2024.2.1"
opencvVersion = "4.8.0-2"
wpimathVersion = "2024.+"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'maven-publish'

ext.licenseFile = files("$rootDir/LICENSE.txt")

def pubVersion = '0.0.1'
def pubVersion = '0.1.0'

def outputsFolder = file("$buildDir/outputs")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.redstorm509.stormkit.command;

import edu.wpi.first.wpilibj.DriverStation;
import edu.wpi.first.wpilibj2.command.Subsystem;
import edu.wpi.first.wpilibj2.command.SubsystemBase;

/**
* An alternative way of organizing subsystem-specific code.
* This generic class takes in an enum that represents the state of the subsytem, and provides interfaces for triggering code when states are entered and exited.
*/
public abstract class StatefulSubsystem<T extends Comparable<T>> extends Subsystem {
public abstract class StatefulSubsystem<T extends Comparable<T>> extends SubsystemBase {
protected T currentState;

/**
Expand Down
6 changes: 3 additions & 3 deletions vendordeps/WPILibNewCommands.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "WPILibNewCommands.json",
"name": "WPILib-New-Commands",
"version": "2023.+",
"version": "2024.+",
"uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
"mavenUrls": [],
"jsonUrl": "",
Expand All @@ -17,7 +17,7 @@
{
"groupId": "edu.wpi.first.wpilibNewCommands",
"artifactId": "wpilibNewCommands-cpp",
"version": "2023.+",
"version": "2024.+",
"libName": "wpilibNewCommands",
"headerClassifier": "headers",
"sourcesClassifier": "sources",
Expand All @@ -34,4 +34,4 @@
]
}
]
}
}

0 comments on commit 99f611a

Please sign in to comment.