Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

Commit

Permalink
bump version to 2024.1.1-beta-3 doesnt build due to invalid vendordeps
Browse files Browse the repository at this point in the history
  • Loading branch information
spacey-sooty committed Nov 16, 2023
1 parent 9d29bd6 commit 3293775
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2023",
"projectYear": "2024",
"teamNumber": 4788
}
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2023.4.3"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down Expand Up @@ -66,10 +66,10 @@ model {

binaries.all {
lib project: ':wombat', library: 'Wombat', linkage: 'static'
cppCompiler.args "-Werror"
cppCompiler.args "-Wextra"
cppCompiler.args "-Wall"
cppCompiler.args "-pedantic"
// cppCompiler.args "-Werror"
// cppCompiler.args "-Wextra"
// cppCompiler.args "-Wall"
// cppCompiler.args "-pedantic"
}

// Set deploy task to deploy this component
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle
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 = '2024'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
51 changes: 26 additions & 25 deletions vendordeps/WPILibNewCommands.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
{
"fileName": "WPILibNewCommands.json",
"name": "WPILib-New-Commands",
"version": "2020.0.0",
"version": "1.0.0",
"uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
"frcYear": "2024",
"mavenUrls": [],
"jsonUrl": "",
"javaDependencies": [
{
"groupId": "edu.wpi.first.wpilibNewCommands",
"artifactId": "wpilibNewCommands-java",
"version": "wpilib"
}
{
"groupId": "edu.wpi.first.wpilibNewCommands",
"artifactId": "wpilibNewCommands-java",
"version": "wpilib"
}
],
"jniDependencies": [],
"cppDependencies": [
{
"groupId": "edu.wpi.first.wpilibNewCommands",
"artifactId": "wpilibNewCommands-cpp",
"version": "wpilib",
"libName": "wpilibNewCommands",
"headerClassifier": "headers",
"sourcesClassifier": "sources",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxathena",
"linuxraspbian",
"linuxaarch64bionic",
"windowsx86-64",
"windowsx86",
"linuxx86-64",
"osxx86-64"
]
}
{
"groupId": "edu.wpi.first.wpilibNewCommands",
"artifactId": "wpilibNewCommands-cpp",
"version": "wpilib",
"libName": "wpilibNewCommands",
"headerClassifier": "headers",
"sourcesClassifier": "sources",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxathena",
"linuxarm32",
"linuxarm64",
"windowsx86-64",
"windowsx86",
"linuxx86-64",
"osxuniversal"
]
}
]
}
2 changes: 1 addition & 1 deletion wombat/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 CurtinFRC
Copyright (c) 2023-2024 CurtinFRC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 0 additions & 1 deletion wombat/src/main/include/example/Example.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

// your includes should be structured as shown below in your .h and .hpp files
// to increase readability Local includes, this means includes from the project
// you are working on eg 2023-ChargedUp

// Wombat includes

Expand Down
Loading

0 comments on commit 3293775

Please sign in to comment.