Skip to content
This repository was archived by the owner on May 3, 2026. It is now read-only.

Commit b6c43bc

Browse files
authored
Update to 2026 Beta 1 (#28)
1 parent 5ef44a3 commit b6c43bc

12 files changed

Lines changed: 248 additions & 168 deletions

File tree

build.gradle

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class FileDependencySet implements NativeDependencySet {
8585
}
8686

8787
def netCommDependencySet = new FileDependencySet(project.files(
88-
'src/lib/netcomm/libFRC_NetworkCommunication.so.25.0.0',
89-
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0',
88+
'src/lib/netcomm/libFRC_NetworkCommunication.so.26.0.0',
89+
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.26.0.0',
9090
'src/lib/visa/libvisa.so.23.3.0'),
9191
project.files())
9292

@@ -171,11 +171,11 @@ build.dependsOn copyAllOutputs
171171

172172
ext.addTaskToCopyAllOutputs = { task ->
173173
copyAllOutputs.dependsOn task
174-
copyAllOutputs.inputs.file task.archivePath
175-
copyAllOutputs.from task.archivePath
174+
copyAllOutputs.inputs.file task.archiveFile
175+
copyAllOutputs.from task.archiveFile
176176
}
177177

178-
def pubVersion = '2025.2.0'
178+
def pubVersion = '2026.1.0'
179179

180180
def baseArtifactId = 'chipobject'
181181
def artifactGroupId = 'edu.wpi.first.ni-libraries'
@@ -217,7 +217,7 @@ copyAllOutputs.from versionFile
217217
task libZip(type: Zip) {
218218
destinationDirectory = outputsFolder
219219
archiveBaseName = zipBaseName
220-
classifier = "linuxathena"
220+
archiveClassifier = "linuxathena"
221221

222222
from('src/lib/chipobject') {
223223
into '/linux/athena/shared/'
@@ -227,7 +227,7 @@ task libZip(type: Zip) {
227227
task libZipDebug(type: Zip) {
228228
destinationDirectory = outputsFolder
229229
archiveBaseName = zipBaseName
230-
classifier = "linuxathenadebug"
230+
archiveClassifier = "linuxathenadebug"
231231

232232
from('src/lib/chipobject') {
233233
into '/linux/athena/shared/'
@@ -237,7 +237,7 @@ task libZipDebug(type: Zip) {
237237
task headersZip(type: Zip) {
238238
destinationDirectory = outputsFolder
239239
archiveBaseName = zipBaseName
240-
classifier = "headers"
240+
archiveClassifier = "headers"
241241

242242
from('src/include/FRC_FPGA_ChipObject') {
243243
into '/FRC_FPGA_ChipObject'
@@ -247,7 +247,7 @@ task headersZip(type: Zip) {
247247
task visaLib(type: Zip) {
248248
destinationDirectory = outputsFolder
249249
archiveBaseName = visaZipBaseName
250-
classifier = "linuxathena"
250+
archiveClassifier = "linuxathena"
251251

252252
from('src/lib/visa') {
253253
into '/linux/athena/shared/'
@@ -257,7 +257,7 @@ task visaLib(type: Zip) {
257257
task visaLibDebug(type: Zip) {
258258
destinationDirectory = outputsFolder
259259
archiveBaseName = visaZipBaseName
260-
classifier = "linuxathenadebug"
260+
archiveClassifier = "linuxathenadebug"
261261

262262
from('src/lib/visa') {
263263
into '/linux/athena/shared/'
@@ -267,7 +267,7 @@ task visaLibDebug(type: Zip) {
267267
task visaHeaders(type: Zip) {
268268
destinationDirectory = outputsFolder
269269
archiveBaseName = visaZipBaseName
270-
classifier = "headers"
270+
archiveClassifier = "headers"
271271

272272
from ('src/include/visa') {
273273
into '/visa'
@@ -277,7 +277,7 @@ task visaHeaders(type: Zip) {
277277
task netCommLib(type: Zip) {
278278
destinationDirectory = outputsFolder
279279
archiveBaseName = netcommZipBaseName
280-
classifier = "linuxathena"
280+
archiveClassifier = "linuxathena"
281281

282282
from('src/lib/netcomm') {
283283
into '/linux/athena/shared/'
@@ -287,7 +287,7 @@ task netCommLib(type: Zip) {
287287
task netCommLibDebug(type: Zip) {
288288
destinationDirectory = outputsFolder
289289
archiveBaseName = netcommZipBaseName
290-
classifier = "linuxathenadebug"
290+
archiveClassifier = "linuxathenadebug"
291291

292292
from('src/lib/netcomm') {
293293
into '/linux/athena/shared/'
@@ -297,7 +297,7 @@ task netCommLibDebug(type: Zip) {
297297
task netCommHeaders(type: Zip) {
298298
destinationDirectory = outputsFolder
299299
archiveBaseName = netcommZipBaseName
300-
classifier = "headers"
300+
archiveClassifier = "headers"
301301

302302
from('src/include/FRC_NetworkCommunication') {
303303
into '/FRC_NetworkCommunication'
@@ -307,19 +307,19 @@ task netCommHeaders(type: Zip) {
307307
task runtimeLib(type: Zip) {
308308
destinationDirectory = outputsFolder
309309
archiveBaseName = runtimeZipBaseName
310-
classifier = "linuxathena"
310+
archiveClassifier = "linuxathena"
311311
}
312312

313313
task runtimeLibDebug(type: Zip) {
314314
destinationDirectory = outputsFolder
315315
archiveBaseName = runtimeZipBaseName
316-
classifier = "linuxathenadebug"
316+
archiveClassifier = "linuxathenadebug"
317317
}
318318

319319
task imageZip(type: Zip) {
320320
destinationDirectory = outputsFolder
321321
archiveBaseName = runtimeZipBaseName
322-
classifier = "allowedimages"
322+
archiveClassifier = "allowedimages"
323323

324324
from('allowed_images.txt')
325325
}
@@ -429,5 +429,5 @@ task patchNiLibraries() {
429429
}
430430

431431
wrapper {
432-
gradleVersion = '7.5.1'
432+
gradleVersion = '8.11.1'
433433
}

config.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ext.createComponentZipTasks = { components, names, base, type, project, func ->
2121
def task = project.tasks.create(base + "-${key}", type) {
2222
description = 'Creates component archive for platform ' + key
2323
destinationDirectory = outputsFolder
24-
classifier = key
24+
archiveClassifier = key
2525
archiveBaseName = base
2626
duplicatesStrategy = 'exclude'
2727

gradle/wrapper/gradle-wrapper.jar

-16.8 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 25 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 13 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)