Team4388/Swerve-Drive
1
0
Fork 0
mirror of https://github.com/Team4388/Swerve-Drive.git synced 2026-06-09 00:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to 2021

Browse Source
This commit is contained in:
nathanrsxtn
2021-11-15 17:10:34 -07:00
parent c6d2fdf80f
commit 7bae37c6a6
4 changed files with 98 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.wpilib/wpilib_preferences.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"enableCppIntellisense": false, "enableCppIntellisense": false,
"currentLanguage": "java", "currentLanguage": "java",
"projectYear": "2020", "projectYear": "2021",
"teamNumber": 4388 "teamNumber": 4388
} }
build.gradle
+12 -1
View File
@@ -1,6 +1,6 @@
plugins { plugins {
id "java" id "java"
id "edu.wpi.first.GradleRIO" version "2020.3.2" id "edu.wpi.first.GradleRIO" version "2021.3.1"
} }
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
@@ -58,6 +58,17 @@ dependencies {
// Enable simulation gui support. Must check the box in vscode to enable support // Enable simulation gui support. Must check the box in vscode to enable support
// upon debugging // upon debugging
simulation wpi.deps.sim.gui(wpi.platforms.desktop, false) simulation wpi.deps.sim.gui(wpi.platforms.desktop, false)
simulation wpi.deps.sim.driverstation(wpi.platforms.desktop, false)
// Websocket extensions require additional configuration.
// simulation wpi.deps.sim.ws_server(wpi.platforms.desktop, false)
// simulation wpi.deps.sim.ws_client(wpi.platforms.desktop, false)
}
// Simulation configuration (e.g. environment variables).
sim {
// Sets the websocket client remote host.
// envVar "HALSIMWS_HOST", "10.0.0.2"
} }
// Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar') // Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar')
settings.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
gradlePluginPortal() gradlePluginPortal()
String frcYear = '2020' String frcYear = '2021'
File frcHome File frcHome
if (OperatingSystem.current().isWindows()) { if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC') String publicFolder = System.getenv('PUBLIC')
vendordeps/Phoenix.json
+84 -50
View File
@@ -1,81 +1,69 @@
{ {
"fileName": "Phoenix.json", "fileName": "Phoenix.json",
"name": "CTRE-Phoenix", "name": "CTRE-Phoenix",
"version": "5.17.3", "version": "5.19.4",
"uuid": "ab676553-b602-441f-a38d-f1296eff6537", "uuid": "ab676553-b602-441f-a38d-f1296eff6537",
"mavenUrls": [ "mavenUrls": [
"http://devsite.ctr-electronics.com/maven/release/" "https://devsite.ctr-electronics.com/maven/release/"
], ],
"jsonUrl": "http://devsite.ctr-electronics.com/maven/release/com/ctre/phoenix/Phoenix-latest.json", "jsonUrl": "https://devsite.ctr-electronics.com/maven/release/com/ctre/phoenix/Phoenix-latest.json",
"javaDependencies": [ "javaDependencies": [
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "api-java", "artifactId": "api-java",
"version": "5.17.3" "version": "5.19.4"
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-java", "artifactId": "wpiapi-java",
"version": "5.17.3" "version": "5.19.4"
} }
], ],
"jniDependencies": [ "jniDependencies": [
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "cci", "artifactId": "cci",
"version": "5.17.3", "version": "5.19.4",
"isJar": false, "isJar": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"validPlatforms": [ "validPlatforms": [
"linuxathena", "linuxathena"
"windowsx86-64",
"linuxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix.sim",
"artifactId": "diagnostics", "artifactId": "cci-sim",
"version": "5.17.3", "version": "5.19.4",
"isJar": false, "isJar": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"validPlatforms": [ "validPlatforms": [
"linuxathena",
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix.sim",
"artifactId": "canutils", "artifactId": "simTalonSRX",
"version": "5.17.3", "version": "5.19.4",
"isJar": false, "isJar": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"validPlatforms": [ "validPlatforms": [
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix.sim",
"artifactId": "platform-stub", "artifactId": "simVictorSPX",
"version": "5.17.3", "version": "5.19.4",
"isJar": false, "isJar": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"validPlatforms": [ "validPlatforms": [
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
] "osxx86-64"
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "core",
"version": "5.17.3",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
] ]
} }
], ],
@@ -83,7 +71,7 @@
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-cpp", "artifactId": "wpiapi-cpp",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_Phoenix_WPI", "libName": "CTRE_Phoenix_WPI",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
@@ -91,13 +79,14 @@
"binaryPlatforms": [ "binaryPlatforms": [
"linuxathena", "linuxathena",
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "api-cpp", "artifactId": "api-cpp",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_Phoenix", "libName": "CTRE_Phoenix",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
@@ -105,27 +94,40 @@
"binaryPlatforms": [ "binaryPlatforms": [
"linuxathena", "linuxathena",
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "cci", "artifactId": "cci",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_PhoenixCCI", "libName": "CTRE_PhoenixCCI",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"binaryPlatforms": [ "binaryPlatforms": [
"linuxathena", "linuxathena"
]
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "cci-sim",
"version": "5.19.4",
"libName": "CTRE_PhoenixCCISim",
"headerClassifier": "headers",
"sharedLibrary": false,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "diagnostics", "artifactId": "diagnostics",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_PhoenixDiagnostics", "libName": "CTRE_PhoenixDiagnostics",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
@@ -133,39 +135,42 @@
"binaryPlatforms": [ "binaryPlatforms": [
"linuxathena", "linuxathena",
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "canutils", "artifactId": "canutils",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_PhoenixCanutils", "libName": "CTRE_PhoenixCanutils",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"binaryPlatforms": [ "binaryPlatforms": [
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "platform-stub", "artifactId": "platform-sim",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_PhoenixPlatform", "libName": "CTRE_PhoenixPlatform",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
"skipInvalidPlatforms": true, "skipInvalidPlatforms": true,
"binaryPlatforms": [ "binaryPlatforms": [
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
] ]
}, },
{ {
"groupId": "com.ctre.phoenix", "groupId": "com.ctre.phoenix",
"artifactId": "core", "artifactId": "core",
"version": "5.17.3", "version": "5.19.4",
"libName": "CTRE_PhoenixCore", "libName": "CTRE_PhoenixCore",
"headerClassifier": "headers", "headerClassifier": "headers",
"sharedLibrary": false, "sharedLibrary": false,
@@ -173,7 +178,36 @@
"binaryPlatforms": [ "binaryPlatforms": [
"linuxathena", "linuxathena",
"windowsx86-64", "windowsx86-64",
"linuxx86-64" "linuxx86-64",
"osxx86-64"
]
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "simTalonSRX",
"version": "5.19.4",
"libName": "CTRE_SimTalonSRX",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxx86-64"
]
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "simVictorSPX",
"version": "5.19.4",
"libName": "CTRE_SimVictorSPX",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxx86-64"
] ]
} }
] ]