Skip to content

Commit

Permalink
Update to use the 2021 season WPILib code, and update the Phoenix ven…
Browse files Browse the repository at this point in the history 
…dor library to 5.19.4 (#30)

* Update to use the 2021 season WPILib code, and update the Phoenix vendor library to 5.19.4

* Update github action to verify that unit tests work for pull requests
  • Loading branch information
@jamesdooley4
jamesdooley4 authored Feb 16, 2021
1 parent 11af457 commit 24fdea0
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

name: Gradle test

on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2020",
"projectYear": "2021",
"teamNumber": 2412
}
Binary file removed 2412RobotLibrary-v0.1.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2020'
String frcYear = '2021'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand All @@ -25,7 +25,7 @@ buildscript {
}
}
dependencies {
classpath "edu.wpi.first.GradleRIO:edu.wpi.first.GradleRIO.gradle.plugin:2020.3.2"
classpath "edu.wpi.first.GradleRIO:edu.wpi.first.GradleRIO.gradle.plugin:2021.1.2"
}
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/robototes/helpers/MockHardwareExtension.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.robototes.helpers;

import edu.wpi.first.hal.HAL;
import edu.wpi.first.hal.sim.DriverStationSim;
import edu.wpi.first.wpilibj.DriverStation;
import edu.wpi.first.wpilibj.simulation.DriverStationSim;

/**
* JUnit 5 testing extension which ensures all WPILib foundational bits are
Expand Down
134 changes: 84 additions & 50 deletions vendordeps/Phoenix.json
View file
Original file line number Diff line number Diff line change
@@ -1,179 +1,213 @@
{
"fileName": "Phoenix.json",
"name": "CTRE-Phoenix",
"version": "5.18.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.18.3"
"version": "5.19.4"
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-java",
"version": "5.18.3"
"version": "5.19.4"
}
],
"jniDependencies": [
{
"groupId": "com.ctre.phoenix",
"artifactId": "cci",
"version": "5.18.3",
"version": "5.19.4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
]
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "diagnostics",
"version": "5.18.3",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
"linuxathena"
]
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "canutils",
"version": "5.18.3",
"groupId": "com.ctre.phoenix.sim",
"artifactId": "cci-sim",
"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.18.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": "core",
"version": "5.18.3",
"groupId": "com.ctre.phoenix.sim",
"artifactId": "simVictorSPX",
"version": "5.19.4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
"linuxx86-64",
"osxx86-64"
]
}
],
"cppDependencies": [
{
"groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-cpp",
"version": "5.18.3",
"version": "5.19.4",
"libName": "CTRE_Phoenix_WPI",
"headerClassifier": "headers",
"sharedLibrary": false,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
"linuxx86-64",
"osxx86-64"
]
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "api-cpp",
"version": "5.18.3",
"version": "5.19.4",
"libName": "CTRE_Phoenix",
"headerClassifier": "headers",
"sharedLibrary": false,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
"linuxx86-64",
"osxx86-64"
]
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "cci",
"version": "5.18.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.18.3",
"version": "5.19.4",
"libName": "CTRE_PhoenixDiagnostics",
"headerClassifier": "headers",
"sharedLibrary": false,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxathena",
"windowsx86-64",
"linuxx86-64"
"linuxx86-64",
"osxx86-64"
]
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "canutils",
"version": "5.18.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.18.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.18.3",
"version": "5.19.4",
"libName": "CTRE_PhoenixCore",
"headerClassifier": "headers",
"sharedLibrary": false,
"skipInvalidPlatforms": true,
"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"
]
}
]
Expand Down

0 comments on commit 24fdea0

Please sign in to comment.