Skip to content

Commit fb1532b

Browse files
sciencewhizsciencewhiz
authored
Use 2027 gradlerio and templates/examples/vendordeps (#762)
1 parent a5018a2 commit fb1532b

12 files changed

Lines changed: 38 additions & 37 deletions

File tree

‎build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
2+
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2025.0'
33
id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2024.0.0'
44
id "de.undercouch.download" version "4.1.2"
55
id "base"
@@ -11,6 +11,7 @@ if (project.hasProperty('buildServer')) {
1111

1212
ext.addedRelease = false
1313
wpilibVersioning.useAllTags = true
14+
wpilibRepositories.use2027Repos()
1415

1516
def azureRelease = System.getenv('GITHUB_REF')
1617
if (azureRelease != null) {
@@ -68,19 +69,19 @@ task extractJavaDependencies(type: Copy) {
6869
}
6970

7071
def downloadNewCommands = tasks.register('downloadNewCommands', Download) {
71-
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibNewCommands/WPILibNewCommands.json'
72+
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/2027/wpilibNewCommands/WPILibNewCommands.json'
7273
dest 'vscode-wpilib/resources/vendordeps/WPILibNewCommands.json'
7374
overwrite true
7475
}
7576

7677
def downloadRomiVendordep = tasks.register('downloadRomiVendordep', Download) {
77-
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/romiVendordep/RomiVendordep.json'
78+
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/2027/romiVendordep/RomiVendordep.json'
7879
dest 'vscode-wpilib/resources/vendordeps/RomiVendordep.json'
7980
overwrite true
8081
}
8182

8283
def downloadXRPVendordep = tasks.register('downloadXRPVendordep', Download) {
83-
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/xrpVendordep/XRPVendordep.json'
84+
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/2027/xrpVendordep/XRPVendordep.json'
8485
dest 'vscode-wpilib/resources/vendordeps/XRPVendordep.json'
8586
overwrite true
8687
}

‎vscode-wpilib/resources/gradle/c/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ plugins {
22
id "c"
33
id "cpp"
44
id "google-test-test-suite"
5-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
5+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
66
}
77

8-
// Define my targets (RoboRIO) and artifacts (deployable files)
8+
// Define my targets (SystemCore) and artifacts (deployable files)
99
// This is added by GradleRIO's backing project DeployUtils.
1010
deploy {
1111
targets {
12-
roborio(getTargetTypeClass('RoboRIO')) {
12+
systemcore(getTargetTypeClass('SystemCore')) {
1313
// Team number is loaded either from the .wpilib/wpilib_preferences.json
1414
// or from command line. If not found an exception will be thrown.
1515
// You can use getTeamOrDefault(team) instead of getTeamNumber if you
@@ -27,16 +27,16 @@ deploy {
2727
// Static files artifact
2828
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
2929
files = project.fileTree('src/main/deploy')
30-
directory = '/home/lvuser/deploy'
31-
deleteOldFiles = false // Change to true to delete files on roboRIO that no
30+
directory = '/home/systemcore/deploy'
31+
deleteOldFiles = false // Change to true to delete files on SystemCore that no
3232
// longer exist in deploy directory of this project
3333
}
3434
}
3535
}
3636
}
3737
}
3838

39-
def deployArtifact = deploy.targets.roborio.artifacts.frcCpp
39+
def deployArtifact = deploy.targets.systemcore.artifacts.frcCpp
4040

4141
// Set this to true to enable desktop support.
4242
def includeDesktopSupport = false
@@ -52,7 +52,7 @@ wpi.sim.addDriverstation()
5252
model {
5353
components {
5454
frcUserProgram(NativeExecutableSpec) {
55-
targetPlatform wpi.platforms.roborio
55+
targetPlatform wpi.platforms.systemcore
5656
if (includeDesktopSupport) {
5757
targetPlatform wpi.platforms.desktop
5858
}

‎vscode-wpilib/resources/gradle/cpp/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
4+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
55
}
66

7-
// Define my targets (RoboRIO) and artifacts (deployable files)
7+
// Define my targets (SystemCore) and artifacts (deployable files)
88
// This is added by GradleRIO's backing project DeployUtils.
99
deploy {
1010
targets {
11-
roborio(getTargetTypeClass('RoboRIO')) {
11+
systemcore(getTargetTypeClass('SystemCore')) {
1212
// Team number is loaded either from the .wpilib/wpilib_preferences.json
1313
// or from command line. If not found an exception will be thrown.
1414
// You can use getTeamOrDefault(team) instead of getTeamNumber if you
@@ -26,16 +26,16 @@ deploy {
2626
// Static files artifact
2727
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
2828
files = project.fileTree('src/main/deploy')
29-
directory = '/home/lvuser/deploy'
30-
deleteOldFiles = false // Change to true to delete files on roboRIO that no
29+
directory = '/home/systemcore/deploy'
30+
deleteOldFiles = false // Change to true to delete files on SystemCore that no
3131
// longer exist in deploy directory of this project
3232
}
3333
}
3434
}
3535
}
3636
}
3737

38-
def deployArtifact = deploy.targets.roborio.artifacts.frcCpp
38+
def deployArtifact = deploy.targets.systemcore.artifacts.frcCpp
3939

4040
// Set this to true to enable desktop support.
4141
def includeDesktopSupport = false
@@ -51,7 +51,7 @@ wpi.sim.addDriverstation()
5151
model {
5252
components {
5353
frcUserProgram(NativeExecutableSpec) {
54-
targetPlatform wpi.platforms.roborio
54+
targetPlatform wpi.platforms.systemcore
5555
if (includeDesktopSupport) {
5656
targetPlatform wpi.platforms.desktop
5757
}

‎vscode-wpilib/resources/gradle/cppdt/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
4+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
55
}
66

77
model {

‎vscode-wpilib/resources/gradle/cppromi/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
4+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
55
}
66

77
// Simulation configuration (e.g. environment variables).

‎vscode-wpilib/resources/gradle/cppxrp/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
4+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
55
}
66

77
// Simulation configuration (e.g. environment variables).

‎vscode-wpilib/resources/gradle/java/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
3+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
44
}
55

66
java {
@@ -10,11 +10,11 @@ java {
1010

1111
def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
1212

13-
// Define my targets (RoboRIO) and artifacts (deployable files)
13+
// Define my targets (SystemCore) and artifacts (deployable files)
1414
// This is added by GradleRIO's backing project DeployUtils.
1515
deploy {
1616
targets {
17-
roborio(getTargetTypeClass('RoboRIO')) {
17+
systemcore(getTargetTypeClass('SystemCore')) {
1818
// Team number is loaded either from the .wpilib/wpilib_preferences.json
1919
// or from command line. If not found an exception will be thrown.
2020
// You can use getTeamOrDefault(team) instead of getTeamNumber if you
@@ -32,16 +32,16 @@ deploy {
3232
// Static files artifact
3333
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
3434
files = project.fileTree('src/main/deploy')
35-
directory = '/home/lvuser/deploy'
36-
deleteOldFiles = false // Change to true to delete files on roboRIO that no
35+
directory = '/home/systemcore/deploy'
36+
deleteOldFiles = false // Change to true to delete files on systemcore that no
3737
// longer exist in deploy directory of this project
3838
}
3939
}
4040
}
4141
}
4242
}
4343

44-
def deployArtifact = deploy.targets.roborio.artifacts.frcJava
44+
def deployArtifact = deploy.targets.systemcore.artifacts.frcJava
4545

4646
// Set to true to use debug for JNI.
4747
wpi.java.debugJni = false
@@ -56,11 +56,11 @@ dependencies {
5656
implementation wpi.java.deps.wpilib()
5757
implementation wpi.java.vendor.java()
5858

59-
roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio)
60-
roborioDebug wpi.java.vendor.jniDebug(wpi.platforms.roborio)
59+
systemcoreDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.systemcore)
60+
systemcoreDebug wpi.java.vendor.jniDebug(wpi.platforms.systemcore)
6161

62-
roborioRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.roborio)
63-
roborioRelease wpi.java.vendor.jniRelease(wpi.platforms.roborio)
62+
systemcoreRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.systemcore)
63+
systemcoreRelease wpi.java.vendor.jniRelease(wpi.platforms.systemcore)
6464

6565
nativeDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop)
6666
nativeDebug wpi.java.vendor.jniDebug(wpi.platforms.desktop)

‎vscode-wpilib/resources/gradle/javadt/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
3+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
44
}
55

66
java {

‎vscode-wpilib/resources/gradle/javaromi/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
3+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
44
}
55

66
java {

‎vscode-wpilib/resources/gradle/javaxrp/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "###GRADLERIOREPLACE###"
3+
id "edu.wpi.first.GradleRIO2027" version "###GRADLERIOREPLACE###"
44
}
55

66
java {

0 commit comments

Comments
 (0)