Skip to content

Commit b6c43bc

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

File tree

12 files changed

+248
-168
lines changed

12 files changed

+248
-168
lines changed

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
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
2830
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -42,11 +45,11 @@ set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
4346
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

0 commit comments

Comments
 (0)