From b48ede50279a10b7f8dce0aef46ae2143cff11c0 Mon Sep 17 00:00:00 2001 From: "Ian N." <163360899+IanNpdx5@users.noreply.github.com> Date: Wed, 4 Nov 2026 17:01:41 -0800 Subject: [PATCH 1/4] upgrade build --- build.gradle | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b9efd92..2fc45ae 100755 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "application" - id "org.wpilib.GradleRIO" version "2027.0.0-alpha-7" + id "org.wpilib.GradleRIO" version "2027.0.0-alpha-8" id "com.peterabeles.gversion" version "1.10" id "com.diffplug.spotless" version "8.6.0" } @@ -58,7 +58,7 @@ wpi.java.runSimWithDebugJni = false def includeDesktopSupport = true // Configuration for AdvantageKit -task(replayWatch, type: JavaExec) { +tasks.register("replayWatch", JavaExec) { mainClass = "org.littletonrobotics.junction.ReplayWatch" classpath = sourceSets.main.runtimeClasspath } @@ -133,22 +133,24 @@ gversion { indent = " " } +def projectDirectory = projectDir +def isDeployTaskIncluded = project.gradle.startParameter.taskNames.any({it.toLowerCase().contains("deploy")}) + // Create commit with working changes on event branches -task(eventDeploy) { +tasks.register("eventDeploy") { doLast { - if (project.gradle.startParameter.taskNames.any({ it.toLowerCase().contains("deploy") })) { + if (isDeployTaskIncluded) { def branchPrefix = "event" def branch = 'git branch --show-current'.execute().text.trim() def commitMessage = "Update at '${new Date().toString()}'" - if (branch.startsWith(branchPrefix)) { - exec { - workingDir(projectDir) + execOperations.exec { + workingDir(projectDirectory) executable 'git' args 'add', '-A' } - exec { - workingDir(projectDir) + execOperations.exec { + workingDir(projectDirectory) executable 'git' args 'commit', '-m', commitMessage ignoreExitValue = true From c3bb54b3eacd6c1ed82f3190631e1506ff2aa845 Mon Sep 17 00:00:00 2001 From: "Ian N." <163360899+IanNpdx5@users.noreply.github.com> Date: Thu, 5 Nov 2026 17:09:35 -0800 Subject: [PATCH 2/4] Add configuration cache and set verisons --- build.gradle | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2fc45ae..5cab379 100755 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id "application" id "org.wpilib.GradleRIO" version "2027.0.0-alpha-8" id "com.peterabeles.gversion" version "1.10" - id "com.diffplug.spotless" version "8.6.0" + id "com.diffplug.spotless" version "8.10.4" } java { @@ -173,7 +173,21 @@ def onlyOurHeaders = '(?is)\\A(?:(?!(?:(?!package ).)*(?:copyright|license|\\u00 // Spotless formatting project.compileJava.dependsOn(spotlessApply) + +spotlessPredeclare { + groovyGradle { + greclipse('4.31') + } + java { + googleJavaFormat('1.36.1') + } + json { + gson().version('2.14.0') + } +} + spotless { + predeclareDepsFromBuildscript() java { target fileTree(".") { include "**/*.java" @@ -191,7 +205,7 @@ spotless { include "**/*.gradle" exclude "**/build/**", "**/build-*/**" } - greclipse() + greclipse('4.31') leadingTabsToSpaces(4) trimTrailingWhitespace() endWithNewline() @@ -213,3 +227,7 @@ spotless { endWithNewline() } } + +tasks.withType(com.diffplug.gradle.spotless.SpotlessTask).configureEach { + notCompatibleWithConfigurationCache("Spotless Equo engine relies on execution-time state unpacking") +} From aa97f1d42e15d1ee4497d3aff38586ede491aa67 Mon Sep 17 00:00:00 2001 From: Ian Northcutt <163360899+IanNpdx5@users.noreply.github.com> Date: Mon, 9 Nov 2026 16:23:22 -0800 Subject: [PATCH 3/4] Update WPILib version in README Updated WPILib version requirement from Alpha 7 to Alpha 8. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7595a63..2228c5a 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ This repository is the source code for 1425's offseason testing of the new 2027 ## Important! -This is using pre-release versions of vendor dependencies, WPILib, and all tools involved. To use this, you must have the 2027 WPILib Alpha 7 installed. +This is using pre-release versions of vendor dependencies, WPILib, and all tools involved. To use this, you must have the 2027 WPILib Alpha 8 installed. From f20a229f3e4069b2be4440294716cbb03049fc6f Mon Sep 17 00:00:00 2001 From: "Ian N." <163360899+IanNpdx5@users.noreply.github.com> Date: Mon, 9 Nov 2026 17:53:30 -0800 Subject: [PATCH 4/4] Stop broken gradle for java from trying to configure *.gradle and erroring every time. --- .vscode/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c015f19..ff01b1c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -70,5 +70,9 @@ }, "java.diagnostic.filter": [ "**build/generated**" - ] + ], + "files.associations": { + "*.json": "json", + "*.gradle": "groovy" + } }