diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index 574cfb9d..3489adad 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -30,5 +30,5 @@ jobs: distribution: temurin java-version: '25' - uses: gradle/actions/setup-gradle@v6 - - run: ./gradlew spotlessCheck + - run: ./gradlew checkSharedFiles spotlessCheck working-directory: examples diff --git a/examples/examples.gradle b/examples/examples.gradle index f1af5b70..cc4ae8f9 100644 --- a/examples/examples.gradle +++ b/examples/examples.gradle @@ -1,3 +1,83 @@ +import java.nio.file.Files +import java.nio.file.StandardCopyOption + +// Each example project gets the contents of the shared/ directories listed here, so its build +// scripts and Gradle wrapper are identical everywhere. Edit the files in shared/ and run +// `./gradlew copySharedFiles`; `./gradlew checkSharedFiles` fails if a project is out of date. +def sharedProjects = [ + 'stage0/solutions' : ['wrapper', 'stage0'], + 'stage0/templates' : ['wrapper', 'stage0'], + 'stage0/snippets' : ['wrapper', 'stage0'], + 'stage1/templates/ctre' : ['wrapper', 'stage1'], + 'stage1/templates/rev' : ['wrapper', 'stage1'], + 'stage1/stage1a/solutions/ctre' : ['wrapper', 'stage1'], + 'stage1/stage1a/solutions/rev' : ['wrapper', 'stage1'], + 'stage1/stage1b/solutions/ctre' : ['wrapper', 'stage1'], + 'stage1/stage1b/solutions/rev' : ['wrapper', 'stage1'], + 'stage1/stage1b/snippets' : ['wrapper', 'stage1'], +] + +// [source path, destination path] for every shared file in every project. +def sharedFilePairs = [] +def sharedRoot = file('shared').toPath() +sharedProjects.each { projectDir, sharedDirs -> + def target = file(projectDir).toPath() + sharedDirs.each { sharedDir -> + def source = sharedRoot.resolve(sharedDir) + source.toFile().eachFileRecurse(groovy.io.FileType.FILES) { sourceFile -> + // Skip Gradle's own cache directories + if (source.relativize(sourceFile.toPath()).startsWith('.gradle')) return + def dest = target.resolve(source.relativize(sourceFile.toPath())) + sharedFilePairs << [sourceFile.toString(), dest.toString()] + } + } +} + +gradle.rootProject { root -> + root.tasks.register('copySharedFiles') { + group = 'build setup' + description = 'Copies shared/ build scripts and the Gradle wrapper into every example project.' + def pairs = sharedFilePairs + mustRunAfter 'checkSharedFiles' + inputs.files(pairs.collect { it[0] }).withPropertyName('sharedFiles') + outputs.files(pairs.collect { it[1] }).withPropertyName('projectCopies') + doLast { + pairs.each { sourcePath, destPath -> + def source = new File(sourcePath) + def dest = new File(destPath) + if (dest.exists() && dest.bytes == source.bytes) return + Files.createDirectories(dest.toPath().parent) + Files.copy(source.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES) + logger.lifecycle("Updated ${dest}") + } + } + } + + root.tasks.register('checkSharedFiles') { + group = 'verification' + description = 'Fails if any example project differs from the shared/ files.' + def pairs = sharedFilePairs + def rootPath = root.projectDir.toPath() + inputs.files(pairs.collect { it[0] }).withPropertyName('sharedFiles') + inputs.files(pairs.collect { it[1] }).withPropertyName('projectCopies') + outputs.upToDateWhen { true } + doLast { + def stale = pairs.findAll { sourcePath, destPath -> + def dest = new File(destPath) + !dest.exists() || dest.bytes != new File(sourcePath).bytes + } + if (stale) { + def list = stale.collect { ' ' + rootPath.relativize(new File(it[1]).toPath()) }.join('\n') + throw new GradleException("Files differ from shared/. Run './gradlew copySharedFiles'.\n${list}") + } + } + } + + root.tasks.matching { it.name in ['build', 'clean', 'spotlessCheck', 'spotlessApply'] }.configureEach { + dependsOn 'copySharedFiles' + } +} + // Auto-discover subprojects by scanning for build.gradle files // Excludes build artifacts, hidden dirs, and the root itself ext.exampleProjectDirs = [] @@ -11,4 +91,4 @@ def scanForProjects(File dir, ArrayList excluded, boolean isInitial) { dir.eachDir { subDir -> scanForProjects(subDir, excluded, false) } } -scanForProjects(file(rootDir), ['build', '.gradle', 'bin', 'gradle', 'node_modules'], true) +scanForProjects(file(rootDir), ['build', '.gradle', 'bin', 'gradle', 'node_modules', 'shared'], true) diff --git a/examples/shared/stage0/build.gradle b/examples/shared/stage0/build.gradle new file mode 100644 index 00000000..1837bbc3 --- /dev/null +++ b/examples/shared/stage0/build.gradle @@ -0,0 +1,87 @@ +plugins { + id 'java' + id "com.diffplug.spotless" version "8.0.0" +} + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 +} + +sourceSets { + main { + java { + setSrcDirs(['src']) + } + } +} + +def sourceFiles = fileTree('src') { include '**/*.java' }.files +def runnableFiles = sourceFiles.findAll { it.text.contains('void main(') } +def runTasks = runnableFiles.collect { src -> + def className = src.name - '.java' + tasks.register("run${className}", JavaExec) { + dependsOn 'compileJava' + classpath = sourceSets.main.output + mainClass = className + } +} + +tasks.register('runAll') { + dependsOn runTasks +} + +def allJavaFiles = fileTree(".") { + include "**/*.java" + exclude "**/build/**", "**/build-*/**" +} + +// Compact source files (JEP 512) declare members at the top level with no enclosing +// type, which google-java-format cannot parse. They only get whitespace cleanup. +def compactSourceFiles = allJavaFiles.filter { it.text =~ /(?m)^void main\(/ } + +spotless { + java { + target allJavaFiles - compactSourceFiles + toggleOffOn() + googleJavaFormat() + trimTrailingWhitespace() + endWithNewline() + } + format "compactSources", { + target compactSourceFiles + trimTrailingWhitespace() + endWithNewline() + } + groovyGradle { + target fileTree(".") { + include "**/*.gradle" + exclude "**/build/**", "**/build-*/**" + } + greclipse() + leadingTabsToSpaces(4) + trimTrailingWhitespace() + endWithNewline() + } + format "misc", { + target fileTree(".") { + include "**/*.md", "**/.gitignore" + exclude "**/build/**", "**/build-*/**" + } + trimTrailingWhitespace() + leadingTabsToSpaces(2) + endWithNewline() + } +} + +tasks.named('compileJava') { + dependsOn 'spotlessJavaCheck' +} + +tasks.named('check') { + dependsOn 'runAll' +} diff --git a/examples/shared/stage0/gradle/wrapper/gradle-wrapper.properties b/examples/shared/stage0/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..c61a118f --- /dev/null +++ b/examples/shared/stage0/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/examples/shared/stage0/settings.gradle b/examples/shared/stage0/settings.gradle new file mode 100644 index 00000000..7bc4171e --- /dev/null +++ b/examples/shared/stage0/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'stage0' diff --git a/examples/shared/stage1/build.gradle b/examples/shared/stage1/build.gradle new file mode 100644 index 00000000..1b841715 --- /dev/null +++ b/examples/shared/stage1/build.gradle @@ -0,0 +1,152 @@ +plugins { + id "java" + id "application" + id "com.diffplug.spotless" version "8.0.0" + id "org.wpilib.GradleRIO" version "2027.0.0-alpha-8" +} + +java { + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 +} + +def ROBOT_MAIN_CLASS = "first.Main" + +// Define my targets (SystemCore) and artifacts (deployable files) +// This is added by GradleRIO's backing project DeployUtils. +deploy { + targets { + systemcore(getTargetTypeClass('SystemCore')) { + // Team number is loaded either from the .wpilib/wpilib_preferences.json + // or from command line. If not found an exception will be thrown. + // You can use getTeamOrDefault(team) instead of getTeamNumber if you + // want to store a team number in this file. + team = project.wpilib.getTeamNumber() + // Use the default systemcore host name. This must be called after setting team + // as happens on the line above + useDefaultSystemcoreHostName() + debug = project.wpilib.getDebugOrDefault(false) + + artifacts { + // First part is artifact name, 2nd is artifact type + // getTargetTypeClass is a shortcut to get the class type using a string + + wpilibJava(getArtifactTypeClass('WPILibJavaArtifact')) { + // Set to true to use debug including JNI, which will drastically impact performance. + debugJni = false + } + + // Static files artifact + wpilibStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { + files = project.fileTree('src/main/deploy') + directory = '/home/systemcore/deploy' + deleteOldFiles = false // Change to true to delete files on systemcore that no + // longer exist in deploy directory of this project + } + } + } + } +} + +def deployArtifact = deploy.targets.systemcore.artifacts.wpilibJava + +// Set to true to use debug for simulation including JNI +wpi.java.runSimWithDebugJni = false + +// Set this to true to enable desktop support. +def includeDesktopSupport = false + +// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries. +// Also defines JUnit 5. +dependencies { + annotationProcessor wpi.java.deps.wpilibAnnotations() + implementation wpi.java.deps.wpilib() + implementation wpi.java.vendor.java() + + systemcoreDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.systemcore) + systemcoreDebug wpi.java.vendor.jniDebug(wpi.platforms.systemcore) + + systemcoreRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.systemcore) + systemcoreRelease wpi.java.vendor.jniRelease(wpi.platforms.systemcore) + + nativeDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop) + nativeDebug wpi.java.vendor.jniDebug(wpi.platforms.desktop) + simulationDebug wpi.sim.enableDebug() + + nativeRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.desktop) + nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop) + simulationRelease wpi.sim.enableRelease() + + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +test { + useJUnitPlatform() + systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' +} + +// Simulation configuration (e.g. environment variables). +wpi.sim.addGui().defaultEnabled = true +wpi.sim.addDriverstation() + +application.mainClass = ROBOT_MAIN_CLASS + +deployArtifact.configureApplication(application) +wpi.java.configureApplication(application) +wpi.java.configureTestTasks(test) + +jar { + from('src') { into 'backup/src' } + from('vendordeps') { into 'backup/vendordeps' } + from('build.gradle') { into 'backup' } +} + +// Configure string concat to always inline compile +tasks.withType(JavaCompile) { + options.compilerArgs.add '-XDstringConcat=inline' +} + +project.compileJava.dependsOn(spotlessApply) +spotless { + java { + target fileTree('.') { + include '**/*.java' + exclude '**/build/**', '**/build-*/**', '**/bin/**' + } + toggleOffOn() + googleJavaFormat() + removeUnusedImports() + trimTrailingWhitespace() + endWithNewline() + } + groovyGradle { + target fileTree('.') { + include '**/*.gradle' + exclude '**/build/**', '**/build-*/**' + } + greclipse() + leadingTabsToSpaces(4) + trimTrailingWhitespace() + endWithNewline() + } + format 'xml', { + target fileTree('.') { + include '**/*.xml' + exclude '**/build/**', '**/build-*/**' + } + eclipseWtp('xml') + trimTrailingWhitespace() + leadingTabsToSpaces(2) + endWithNewline() + } + format 'misc', { + target fileTree('.') { + include '**/*.md', '**/.gitignore' + exclude '**/build/**', '**/build-*/**' + } + trimTrailingWhitespace() + leadingTabsToSpaces(2) + endWithNewline() + } +} diff --git a/examples/shared/stage1/gradle/wrapper/gradle-wrapper.properties b/examples/shared/stage1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..42bb5ac9 --- /dev/null +++ b/examples/shared/stage1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=permwrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=permwrapper/dists diff --git a/examples/shared/stage1/settings.gradle b/examples/shared/stage1/settings.gradle new file mode 100644 index 00000000..a17bda05 --- /dev/null +++ b/examples/shared/stage1/settings.gradle @@ -0,0 +1,38 @@ +import org.gradle.internal.os.OperatingSystem + +pluginManagement { + repositories { + String wpilibYear = '2027_alpha7' + File wpilibHome + def os = OperatingSystem.current() + if (os.isWindows()) { + String publicFolder = System.getenv('PUBLIC') + if (publicFolder == null) { + publicFolder = "C:\\Users\\Public" + } + def homeRoot = new File(publicFolder, "wpilib") + wpilibHome = new File(homeRoot, wpilibYear) + } else if (os.isLinux()) { + String xdgDataHome = System.getenv('XDG_DATA_HOME') + if (xdgDataHome == null || xdgDataHome.trim().isEmpty() || !new File(xdgDataHome).isAbsolute()) { + xdgDataHome = new File(System.getProperty("user.home"), ".local/share").getPath() + } + def homeRoot = new File(xdgDataHome, "wpilib") + wpilibHome = new File(homeRoot, wpilibYear) + } else { + def userFolder = System.getProperty("user.home") + def homeRoot = new File(userFolder, ".wpilib") + wpilibHome = new File(homeRoot, wpilibYear) + } + def wpilibHomeMaven = new File(wpilibHome, 'maven') + maven { + name = 'wpilibHome' + url = wpilibHomeMaven + } + mavenLocal() + gradlePluginPortal() + } +} + +Properties props = System.getProperties(); +props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true"); diff --git a/examples/shared/wrapper/gradle/wrapper/gradle-wrapper.jar b/examples/shared/wrapper/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..d997cfc6 Binary files /dev/null and b/examples/shared/wrapper/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/shared/wrapper/gradlew b/examples/shared/wrapper/gradlew new file mode 100755 index 00000000..739907df --- /dev/null +++ b/examples/shared/wrapper/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/examples/shared/wrapper/gradlew.bat b/examples/shared/wrapper/gradlew.bat new file mode 100644 index 00000000..c4bdd3ab --- /dev/null +++ b/examples/shared/wrapper/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/stage0/snippets/build.gradle b/examples/stage0/snippets/build.gradle index 77a42427..1837bbc3 100644 --- a/examples/stage0/snippets/build.gradle +++ b/examples/stage0/snippets/build.gradle @@ -20,9 +20,9 @@ sourceSets { } } -def snippetFiles = fileTree('src') { include '**/*.java' }.files -def runnableFiles = snippetFiles.findAll { it.text.contains('void main(') } -def snippetRunTasks = runnableFiles.collect { src -> +def sourceFiles = fileTree('src') { include '**/*.java' }.files +def runnableFiles = sourceFiles.findAll { it.text.contains('void main(') } +def runTasks = runnableFiles.collect { src -> def className = src.name - '.java' tasks.register("run${className}", JavaExec) { dependsOn 'compileJava' @@ -31,8 +31,8 @@ def snippetRunTasks = runnableFiles.collect { src -> } } -tasks.register('runSnippets') { - dependsOn snippetRunTasks +tasks.register('runAll') { + dependsOn runTasks } def allJavaFiles = fileTree(".") { @@ -83,5 +83,5 @@ tasks.named('compileJava') { } tasks.named('check') { - dependsOn 'runSnippets' + dependsOn 'runAll' } diff --git a/examples/stage0/snippets/settings.gradle b/examples/stage0/snippets/settings.gradle index c1ff0c44..7bc4171e 100644 --- a/examples/stage0/snippets/settings.gradle +++ b/examples/stage0/snippets/settings.gradle @@ -1 +1 @@ -rootProject.name = 'stage0-snippets' +rootProject.name = 'stage0' diff --git a/examples/stage0/solutions/build.gradle b/examples/stage0/solutions/build.gradle index 8711d350..1837bbc3 100644 --- a/examples/stage0/solutions/build.gradle +++ b/examples/stage0/solutions/build.gradle @@ -20,9 +20,9 @@ sourceSets { } } -def solutionFiles = fileTree('src') { include '**/*.java' }.files -def runnableFiles = solutionFiles.findAll { it.text.contains('void main(') } -def solutionRunTasks = runnableFiles.collect { src -> +def sourceFiles = fileTree('src') { include '**/*.java' }.files +def runnableFiles = sourceFiles.findAll { it.text.contains('void main(') } +def runTasks = runnableFiles.collect { src -> def className = src.name - '.java' tasks.register("run${className}", JavaExec) { dependsOn 'compileJava' @@ -31,8 +31,8 @@ def solutionRunTasks = runnableFiles.collect { src -> } } -tasks.register('runSolutions') { - dependsOn solutionRunTasks +tasks.register('runAll') { + dependsOn runTasks } def allJavaFiles = fileTree(".") { @@ -83,5 +83,5 @@ tasks.named('compileJava') { } tasks.named('check') { - dependsOn 'runSolutions' + dependsOn 'runAll' } diff --git a/examples/stage0/solutions/settings.gradle b/examples/stage0/solutions/settings.gradle index cf23f378..7bc4171e 100644 --- a/examples/stage0/solutions/settings.gradle +++ b/examples/stage0/solutions/settings.gradle @@ -1 +1 @@ -rootProject.name = 'stage0-solutions' +rootProject.name = 'stage0' diff --git a/examples/stage0/templates/build.gradle b/examples/stage0/templates/build.gradle index 706c44dd..1837bbc3 100644 --- a/examples/stage0/templates/build.gradle +++ b/examples/stage0/templates/build.gradle @@ -20,9 +20,9 @@ sourceSets { } } -def templateFiles = fileTree('src') { include '**/*.java' }.files -def runnableFiles = templateFiles.findAll { it.text.contains('void main(') } -def templateRunTasks = runnableFiles.collect { src -> +def sourceFiles = fileTree('src') { include '**/*.java' }.files +def runnableFiles = sourceFiles.findAll { it.text.contains('void main(') } +def runTasks = runnableFiles.collect { src -> def className = src.name - '.java' tasks.register("run${className}", JavaExec) { dependsOn 'compileJava' @@ -31,8 +31,8 @@ def templateRunTasks = runnableFiles.collect { src -> } } -tasks.register('runTemplates') { - dependsOn templateRunTasks +tasks.register('runAll') { + dependsOn runTasks } def allJavaFiles = fileTree(".") { @@ -83,5 +83,5 @@ tasks.named('compileJava') { } tasks.named('check') { - dependsOn 'runTemplates' + dependsOn 'runAll' } diff --git a/examples/stage0/templates/settings.gradle b/examples/stage0/templates/settings.gradle index 2b11f7b3..7bc4171e 100644 --- a/examples/stage0/templates/settings.gradle +++ b/examples/stage0/templates/settings.gradle @@ -1 +1 @@ -rootProject.name = 'stage0-templates' +rootProject.name = 'stage0' diff --git a/examples/stage1/stage1a/solutions/ctre/gradlew b/examples/stage1/stage1a/solutions/ctre/gradlew old mode 100644 new mode 100755 diff --git a/examples/stage1/stage1a/solutions/ctre/settings.gradle b/examples/stage1/stage1a/solutions/ctre/settings.gradle index 8353c47c..a17bda05 100644 --- a/examples/stage1/stage1a/solutions/ctre/settings.gradle +++ b/examples/stage1/stage1a/solutions/ctre/settings.gradle @@ -2,7 +2,7 @@ import org.gradle.internal.os.OperatingSystem pluginManagement { repositories { - String wpilibYear = '2027_alpha5' + String wpilibYear = '2027_alpha7' File wpilibHome def os = OperatingSystem.current() if (os.isWindows()) { diff --git a/examples/stage1/stage1a/solutions/rev/settings.gradle b/examples/stage1/stage1a/solutions/rev/settings.gradle index 8353c47c..a17bda05 100644 --- a/examples/stage1/stage1a/solutions/rev/settings.gradle +++ b/examples/stage1/stage1a/solutions/rev/settings.gradle @@ -2,7 +2,7 @@ import org.gradle.internal.os.OperatingSystem pluginManagement { repositories { - String wpilibYear = '2027_alpha5' + String wpilibYear = '2027_alpha7' File wpilibHome def os = OperatingSystem.current() if (os.isWindows()) { diff --git a/examples/stage1/stage1b/snippets/build.gradle b/examples/stage1/stage1b/snippets/build.gradle index 7714c903..1b841715 100644 --- a/examples/stage1/stage1b/snippets/build.gradle +++ b/examples/stage1/stage1b/snippets/build.gradle @@ -10,7 +10,7 @@ java { targetCompatibility = JavaVersion.VERSION_25 } -def ROBOT_MAIN_CLASS = "" +def ROBOT_MAIN_CLASS = "first.Main" // Define my targets (SystemCore) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. @@ -110,29 +110,40 @@ tasks.withType(JavaCompile) { project.compileJava.dependsOn(spotlessApply) spotless { java { - target fileTree(".") { - include "**/*.java" - exclude "**/build/**", "**/build-*/**" + target fileTree('.') { + include '**/*.java' + exclude '**/build/**', '**/build-*/**', '**/bin/**' } toggleOffOn() googleJavaFormat() + removeUnusedImports() trimTrailingWhitespace() endWithNewline() } groovyGradle { - target fileTree(".") { - include "**/*.gradle" - exclude "**/build/**", "**/build-*/**" + target fileTree('.') { + include '**/*.gradle' + exclude '**/build/**', '**/build-*/**' } greclipse() leadingTabsToSpaces(4) trimTrailingWhitespace() endWithNewline() } - format "misc", { - target fileTree(".") { - include "**/*.md", "**/.gitignore" - exclude "**/build/**", "**/build-*/**" + format 'xml', { + target fileTree('.') { + include '**/*.xml' + exclude '**/build/**', '**/build-*/**' + } + eclipseWtp('xml') + trimTrailingWhitespace() + leadingTabsToSpaces(2) + endWithNewline() + } + format 'misc', { + target fileTree('.') { + include '**/*.md', '**/.gitignore' + exclude '**/build/**', '**/build-*/**' } trimTrailingWhitespace() leadingTabsToSpaces(2) diff --git a/examples/stage1/stage1b/solutions/ctre/gradlew b/examples/stage1/stage1b/solutions/ctre/gradlew old mode 100644 new mode 100755 diff --git a/examples/stage1/stage1b/solutions/ctre/settings.gradle b/examples/stage1/stage1b/solutions/ctre/settings.gradle index e2626a81..a17bda05 100644 --- a/examples/stage1/stage1b/solutions/ctre/settings.gradle +++ b/examples/stage1/stage1b/solutions/ctre/settings.gradle @@ -2,18 +2,26 @@ import org.gradle.internal.os.OperatingSystem pluginManagement { repositories { - String wpilibYear = '2027_alpha5' + String wpilibYear = '2027_alpha7' File wpilibHome - if (OperatingSystem.current().isWindows()) { + def os = OperatingSystem.current() + if (os.isWindows()) { String publicFolder = System.getenv('PUBLIC') if (publicFolder == null) { publicFolder = "C:\\Users\\Public" } def homeRoot = new File(publicFolder, "wpilib") wpilibHome = new File(homeRoot, wpilibYear) + } else if (os.isLinux()) { + String xdgDataHome = System.getenv('XDG_DATA_HOME') + if (xdgDataHome == null || xdgDataHome.trim().isEmpty() || !new File(xdgDataHome).isAbsolute()) { + xdgDataHome = new File(System.getProperty("user.home"), ".local/share").getPath() + } + def homeRoot = new File(xdgDataHome, "wpilib") + wpilibHome = new File(homeRoot, wpilibYear) } else { def userFolder = System.getProperty("user.home") - def homeRoot = new File(userFolder, "wpilib") + def homeRoot = new File(userFolder, ".wpilib") wpilibHome = new File(homeRoot, wpilibYear) } def wpilibHomeMaven = new File(wpilibHome, 'maven') diff --git a/examples/stage1/stage1b/solutions/rev/build.gradle b/examples/stage1/stage1b/solutions/rev/build.gradle index 31ad69e7..1b841715 100644 --- a/examples/stage1/stage1b/solutions/rev/build.gradle +++ b/examples/stage1/stage1b/solutions/rev/build.gradle @@ -120,6 +120,26 @@ spotless { trimTrailingWhitespace() endWithNewline() } + groovyGradle { + target fileTree('.') { + include '**/*.gradle' + exclude '**/build/**', '**/build-*/**' + } + greclipse() + leadingTabsToSpaces(4) + trimTrailingWhitespace() + endWithNewline() + } + format 'xml', { + target fileTree('.') { + include '**/*.xml' + exclude '**/build/**', '**/build-*/**' + } + eclipseWtp('xml') + trimTrailingWhitespace() + leadingTabsToSpaces(2) + endWithNewline() + } format 'misc', { target fileTree('.') { include '**/*.md', '**/.gitignore' @@ -129,4 +149,4 @@ spotless { leadingTabsToSpaces(2) endWithNewline() } -} \ No newline at end of file +} diff --git a/examples/stage1/templates/ctre/gradlew b/examples/stage1/templates/ctre/gradlew old mode 100644 new mode 100755 diff --git a/examples/stage1/templates/rev/gradlew b/examples/stage1/templates/rev/gradlew old mode 100644 new mode 100755 diff --git a/examples/stage1/templates/rev/settings.gradle b/examples/stage1/templates/rev/settings.gradle index 8353c47c..a17bda05 100644 --- a/examples/stage1/templates/rev/settings.gradle +++ b/examples/stage1/templates/rev/settings.gradle @@ -2,7 +2,7 @@ import org.gradle.internal.os.OperatingSystem pluginManagement { repositories { - String wpilibYear = '2027_alpha5' + String wpilibYear = '2027_alpha7' File wpilibHome def os = OperatingSystem.current() if (os.isWindows()) {