From 7bae37c6a65d33cdf5b5ed0ec9576a41586e24a2 Mon Sep 17 00:00:00 2001 From: nathanrsxtn Date: Mon, 15 Nov 2021 17:10:34 -0700 Subject: [PATCH] Upgrade to 2021 --- .wpilib/wpilib_preferences.json | 2 +- build.gradle | 13 +++- settings.gradle | 2 +- vendordeps/Phoenix.json | 134 ++++++++++++++++++++------------ 4 files changed, 98 insertions(+), 53 deletions(-) diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index a5920a4..0b623f1 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2020", + "projectYear": "2021", "teamNumber": 4388 } \ No newline at end of file diff --git a/build.gradle b/build.gradle index b202c6b..b0a450c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2020.3.2" + id "edu.wpi.first.GradleRIO" version "2021.3.1" } sourceCompatibility = JavaVersion.VERSION_11 @@ -58,6 +58,17 @@ dependencies { // Enable simulation gui support. Must check the box in vscode to enable support // upon debugging 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') diff --git a/settings.gradle b/settings.gradle index 81f96ab..0bc697a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - String frcYear = '2020' + String frcYear = '2021' File frcHome if (OperatingSystem.current().isWindows()) { String publicFolder = System.getenv('PUBLIC') diff --git a/vendordeps/Phoenix.json b/vendordeps/Phoenix.json index f8d42a4..87f03cb 100644 --- a/vendordeps/Phoenix.json +++ b/vendordeps/Phoenix.json @@ -1,81 +1,69 @@ { "fileName": "Phoenix.json", "name": "CTRE-Phoenix", - "version": "5.17.3", + "version": "5.19.4", "uuid": "ab676553-b602-441f-a38d-f1296eff6537", "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": [ { "groupId": "com.ctre.phoenix", "artifactId": "api-java", - "version": "5.17.3" + "version": "5.19.4" }, { "groupId": "com.ctre.phoenix", "artifactId": "wpiapi-java", - "version": "5.17.3" + "version": "5.19.4" } ], "jniDependencies": [ { "groupId": "com.ctre.phoenix", "artifactId": "cci", - "version": "5.17.3", + "version": "5.19.4", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ - "linuxathena", - "windowsx86-64", - "linuxx86-64" + "linuxathena" ] }, { - "groupId": "com.ctre.phoenix", - "artifactId": "diagnostics", - "version": "5.17.3", + "groupId": "com.ctre.phoenix.sim", + "artifactId": "cci-sim", + "version": "5.19.4", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ - "linuxathena", "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { - "groupId": "com.ctre.phoenix", - "artifactId": "canutils", - "version": "5.17.3", + "groupId": "com.ctre.phoenix.sim", + "artifactId": "simTalonSRX", + "version": "5.19.4", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { - "groupId": "com.ctre.phoenix", - "artifactId": "platform-stub", - "version": "5.17.3", + "groupId": "com.ctre.phoenix.sim", + "artifactId": "simVictorSPX", + "version": "5.19.4", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ "windowsx86-64", - "linuxx86-64" - ] - }, - { - "groupId": "com.ctre.phoenix", - "artifactId": "core", - "version": "5.17.3", - "isJar": false, - "skipInvalidPlatforms": true, - "validPlatforms": [ - "linuxathena", - "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] } ], @@ -83,7 +71,7 @@ { "groupId": "com.ctre.phoenix", "artifactId": "wpiapi-cpp", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_Phoenix_WPI", "headerClassifier": "headers", "sharedLibrary": false, @@ -91,13 +79,14 @@ "binaryPlatforms": [ "linuxathena", "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", "artifactId": "api-cpp", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_Phoenix", "headerClassifier": "headers", "sharedLibrary": false, @@ -105,27 +94,40 @@ "binaryPlatforms": [ "linuxathena", "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", "artifactId": "cci", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_PhoenixCCI", "headerClassifier": "headers", "sharedLibrary": false, "skipInvalidPlatforms": true, "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", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", "artifactId": "diagnostics", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_PhoenixDiagnostics", "headerClassifier": "headers", "sharedLibrary": false, @@ -133,39 +135,42 @@ "binaryPlatforms": [ "linuxathena", "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", "artifactId": "canutils", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_PhoenixCanutils", "headerClassifier": "headers", "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", - "artifactId": "platform-stub", - "version": "5.17.3", + "artifactId": "platform-sim", + "version": "5.19.4", "libName": "CTRE_PhoenixPlatform", "headerClassifier": "headers", "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ "windowsx86-64", - "linuxx86-64" + "linuxx86-64", + "osxx86-64" ] }, { "groupId": "com.ctre.phoenix", "artifactId": "core", - "version": "5.17.3", + "version": "5.19.4", "libName": "CTRE_PhoenixCore", "headerClassifier": "headers", "sharedLibrary": false, @@ -173,7 +178,36 @@ "binaryPlatforms": [ "linuxathena", "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" ] } ]