diff --git a/build.gradle b/build.gradle index 2db7083603..3e8f45f37e 100644 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,7 @@ task libraryBuild() {} build.dependsOn outputVersions task copyAllOutputs(type: Copy) { - destinationDir outputsFolder + destinationDir = outputsFolder } build.dependsOn copyAllOutputs @@ -170,5 +170,5 @@ ext.getCurrentArch = { } wrapper { - gradleVersion = '8.11' + gradleVersion = '8.14.3' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 36829299fb..58b94ad4c4 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,7 +5,7 @@ repositories { url = 'https://frcmaven.wpi.edu/artifactory/ex-gradle' } mavenCentral() - url "https://plugins.gradle.org/m2/" + url = "https://plugins.gradle.org/m2/" } } dependencies { diff --git a/datalogtool/publish.gradle b/datalogtool/publish.gradle index 6e6f079bc9..4f433961a9 100644 --- a/datalogtool/publish.gradle +++ b/datalogtool/publish.gradle @@ -31,7 +31,7 @@ model { // Create the ZIP. def task = project.tasks.create("copyDataLogToolExecutable" + binary.targetPlatform.operatingSystem.name + binary.targetPlatform.architecture.name, Zip) { - description("Copies the DataLogTool executable to the outputs directory.") + description = "Copies the DataLogTool executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -117,7 +117,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/docs/build.gradle b/docs/build.gradle index bdc4e3e08a..597699515f 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -177,7 +177,7 @@ tasks.register("zipCppDocs", Zip) { // Java configurations { javaSource { - transitive false + transitive = false } } @@ -265,15 +265,15 @@ publishing { artifact zipJavaDocs artifactId = "${baseArtifactIdJava}" - groupId artifactGroupIdJava - version wpilibVersioning.version.get() + groupId = artifactGroupIdJava + version = wpilibVersioning.version.get() } cpp(MavenPublication) { artifact zipCppDocs artifactId = "${baseArtifactIdCpp}" - groupId artifactGroupIdCpp - version wpilibVersioning.version.get() + groupId = artifactGroupIdCpp + version = wpilibVersioning.version.get() } } } diff --git a/fieldImages/publish.gradle b/fieldImages/publish.gradle index 688376e8b3..1ce268c184 100644 --- a/fieldImages/publish.gradle +++ b/fieldImages/publish.gradle @@ -63,8 +63,8 @@ model { artifact cppSourcesZip artifactId = "${baseArtifactId}-cpp" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/glass/publish.gradle b/glass/publish.gradle index ab8df4f9ac..a29ad2401c 100644 --- a/glass/publish.gradle +++ b/glass/publish.gradle @@ -86,7 +86,7 @@ model { // Create the ZIP. def task = project.tasks.create("copyGlassExecutable" + binary.targetPlatform.operatingSystem.name + binary.targetPlatform.architecture.name, Zip) { - description("Copies the Glass executable to the outputs directory.") + description = "Copies the Glass executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -175,7 +175,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } libglass(MavenPublication) { libGlassTaskList.each { artifact it } @@ -185,7 +185,7 @@ model { artifactId = libBaseArtifactId groupId = libArtifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } libglassnt(MavenPublication) { libGlassntTaskList.each { artifact it } @@ -195,7 +195,7 @@ model { artifactId = libntBaseArtifactId groupId = libntArtifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530..1b33c55baa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f200e..d4081da476 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6b..23d15a9367 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # 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 -' "$PWD" ) || exit +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 @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * 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. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c79..5eed7ee845 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/msvcruntime/build.gradle b/msvcruntime/build.gradle index 2bbcd1382c..b8cb6b880e 100644 --- a/msvcruntime/build.gradle +++ b/msvcruntime/build.gradle @@ -1,6 +1,5 @@ import org.gradle.nativeplatform.toolchain.internal.msvcpp.VisualStudioLocator import org.gradle.internal.os.OperatingSystem -import org.gradle.util.VersionNumber plugins { id 'cpp' diff --git a/ntcoreffi/build.gradle b/ntcoreffi/build.gradle index ca86fe8fb8..dab982e408 100644 --- a/ntcoreffi/build.gradle +++ b/ntcoreffi/build.gradle @@ -140,8 +140,8 @@ model { artifact cppHeadersZip artifactId = "${baseArtifactId}-cpp" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/outlineviewer/publish.gradle b/outlineviewer/publish.gradle index 4b5d287fc6..824962e690 100644 --- a/outlineviewer/publish.gradle +++ b/outlineviewer/publish.gradle @@ -31,7 +31,7 @@ model { // Create the ZIP. def task = project.tasks.create("copyOutlineViewerExecutable" + binary.targetPlatform.operatingSystem.name + binary.targetPlatform.architecture.name, Zip) { - description("Copies the OutlineViewer executable to the outputs directory.") + description = "Copies the OutlineViewer executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -117,7 +117,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/processstarter/publish.gradle b/processstarter/publish.gradle index 49b4bd42fe..b287bf930a 100644 --- a/processstarter/publish.gradle +++ b/processstarter/publish.gradle @@ -30,7 +30,7 @@ model { // Create the ZIP. def task = project.tasks.create("copyprocessstarterExecutable" + binary.targetPlatform.architecture.name, Zip) { - description("Copies the processstarter executable to the outputs directory.") + description = "Copies the processstarter executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -60,7 +60,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/roborioteamnumbersetter/publish.gradle b/roborioteamnumbersetter/publish.gradle index 7b147195ae..e5b228bb0a 100644 --- a/roborioteamnumbersetter/publish.gradle +++ b/roborioteamnumbersetter/publish.gradle @@ -31,7 +31,7 @@ model { // Create the ZIP. def task = project.tasks.create("copyroboRIOTeamNumberSetterExecutable" + binary.targetPlatform.operatingSystem.name + binary.targetPlatform.architecture.name, Zip) { - description("Copies the roboRIOTeamNumberSetter executable to the outputs directory.") + description = "Copies the roboRIOTeamNumberSetter executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -117,7 +117,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index 7802818b48..3f82db58ed 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -65,8 +65,8 @@ publishing { artifact javadocJar artifactId = "${baseArtifactId}-java" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } @@ -76,7 +76,7 @@ test { systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' testLogging { events "failed" - exceptionFormat "full" + exceptionFormat = "full" } finalizedBy jacocoTestReport } diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle index 5af49f0c45..ca7fc5f7d8 100644 --- a/shared/javacpp/publish.gradle +++ b/shared/javacpp/publish.gradle @@ -67,8 +67,8 @@ model { artifact cppSourcesZip artifactId = "${baseArtifactId}-cpp" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle index dd1ec1cb07..9bfe4d0282 100644 --- a/shared/jni/publish.gradle +++ b/shared/jni/publish.gradle @@ -85,8 +85,8 @@ model { artifact cppSourcesZip artifactId = "${baseArtifactId}-cpp" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } @@ -118,8 +118,8 @@ model { } artifactId = "${baseArtifactId}-jnicvstatic" - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/shared/plugins/publish.gradle b/shared/plugins/publish.gradle index 8d7b9d4b71..7c7a980b55 100644 --- a/shared/plugins/publish.gradle +++ b/shared/plugins/publish.gradle @@ -56,8 +56,8 @@ model { artifactId = baseArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/sysid/publish.gradle b/sysid/publish.gradle index 568abea3dd..c998accd30 100644 --- a/sysid/publish.gradle +++ b/sysid/publish.gradle @@ -31,7 +31,7 @@ model { // Create the macOS bundle. def bundleTask = project.tasks.create("bundleSysIdOsxApp" + binary.targetPlatform.architecture.name, Copy) { - description("Creates a macOS application bundle for SysId") + description = "Creates a macOS application bundle for SysId" from(file("$project.projectDir/Info.plist")) into(file("$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/SysId.app/Contents")) into("MacOS") { @@ -74,7 +74,7 @@ model { // Create the ZIP. def task = project.tasks.create("copySysIdExecutable" + binary.targetPlatform.architecture.name, Zip) { - description("Copies the SysId executable to the outputs directory.") + description = "Copies the SysId executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -118,7 +118,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/thirdparty/googletest/publish.gradle b/thirdparty/googletest/publish.gradle index 3bcd84dd93..c9ef0172b2 100644 --- a/thirdparty/googletest/publish.gradle +++ b/thirdparty/googletest/publish.gradle @@ -54,8 +54,8 @@ model { artifact cppSourcesZip artifactId = baseArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/thirdparty/imgui_suite/publish.gradle b/thirdparty/imgui_suite/publish.gradle index 818a180bfc..943c5cc877 100644 --- a/thirdparty/imgui_suite/publish.gradle +++ b/thirdparty/imgui_suite/publish.gradle @@ -85,8 +85,8 @@ model { artifact cppSourcesZip artifactId = baseArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/wpical/publish.gradle b/wpical/publish.gradle index 5af5956239..16875347b8 100644 --- a/wpical/publish.gradle +++ b/wpical/publish.gradle @@ -31,7 +31,7 @@ model { // Create the ZIP. def task = project.tasks.create("copywpicalExecutable" + binary.targetPlatform.operatingSystem.name + binary.targetPlatform.architecture.name, Zip) { - description("Copies the wpical executable to the outputs directory.") + description = "Copies the wpical executable to the outputs directory." destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -121,7 +121,7 @@ model { artifactId = baseArtifactId groupId = artifactGroupId - version wpilibVersioning.version.get() + version = wpilibVersioning.version.get() } } } diff --git a/wpigui/publish.gradle b/wpigui/publish.gradle index c137d7c579..6c102cc389 100644 --- a/wpigui/publish.gradle +++ b/wpigui/publish.gradle @@ -63,8 +63,8 @@ model { artifact cppSourcesZip artifactId = baseArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/wpilibc/publish.gradle b/wpilibc/publish.gradle index aff50caa69..2c0452c082 100644 --- a/wpilibc/publish.gradle +++ b/wpilibc/publish.gradle @@ -66,8 +66,8 @@ model { artifact cppSourcesZip artifactId = baseArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle index e0fba64688..0918ea6921 100644 --- a/wpilibcExamples/publish.gradle +++ b/wpilibcExamples/publish.gradle @@ -76,24 +76,24 @@ publishing { artifact cppExamplesZip artifactId = baseExamplesArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } templates(MavenPublication) { artifact cppTemplatesZip artifactId = baseTemplatesArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } commands(MavenPublication) { artifact cppCommandsZip artifactId = baseCommandsArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index 7ab64e7ecb..6af7a5668d 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -94,7 +94,7 @@ model { } } } - destinationDir testOutputFolder + destinationDir = testOutputFolder } // This is in a separate if statement because of what I would assume is a bug in grade. // Will file an issue on their side. diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle index eec38c0a35..9bca5f3a39 100644 --- a/wpilibjExamples/build.gradle +++ b/wpilibjExamples/build.gradle @@ -162,7 +162,7 @@ model { new groovy.json.JsonSlurper().parseText(exampleFile.text).each { entry -> project.tasks.create("run${entry.foldername}", JavaExec) { run -> - run.group "run examples" + run.group = "run examples" run.mainClass = "edu.wpi.first.wpilibj.examples." + entry.foldername + "." + entry.mainclass run.classpath = sourceSets.main.runtimeClasspath run.dependsOn it.tasks.install @@ -174,7 +174,7 @@ model { } } project.tasks.create("test${entry.foldername}", Test) { testTask -> - testTask.group "verification" + testTask.group = "verification" testTask.useJUnitPlatform() testTask.filter { includeTestsMatching("edu.wpi.first.wpilibj.examples.${entry.foldername}.*") @@ -195,7 +195,7 @@ model { testTask.systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' testTask.testLogging { events "failed" - exceptionFormat "full" + exceptionFormat = "full" } testTask.systemProperty 'java.library.path', filePath @@ -207,7 +207,7 @@ model { } new groovy.json.JsonSlurper().parseText(snippetsFile.text).each { entry -> project.tasks.create("runSnippet${entry.foldername}", JavaExec) { run -> - run.group "run snippets" + run.group = "run snippets" run.mainClass = "edu.wpi.first.wpilibj.snippets." + entry.foldername + "." + entry.mainclass run.classpath = sourceSets.main.runtimeClasspath run.dependsOn it.tasks.install @@ -219,7 +219,7 @@ model { } } project.tasks.create("testSnippet${entry.foldername}", Test) { testTask -> - testTask.group "verification" + testTask.group = "verification" testTask.useJUnitPlatform() testTask.filter { includeTestsMatching("edu.wpi.first.wpilibj.snippets.${entry.foldername}.*") @@ -236,7 +236,7 @@ model { testTask.systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' testTask.testLogging { events "failed" - exceptionFormat "full" + exceptionFormat = "full" } testTask.systemProperty 'java.library.path', filePath diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle index fc90e78909..02c82ca847 100644 --- a/wpilibjExamples/publish.gradle +++ b/wpilibjExamples/publish.gradle @@ -76,24 +76,24 @@ publishing { artifact javaExamplesZip artifactId = baseExamplesArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } templates(MavenPublication) { artifact javaTemplatesZip artifactId = baseTemplatesArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } commands(MavenPublication) { artifact javaCommandsZip artifactId = baseCommandsArtifactId - groupId artifactGroupId - version wpilibVersioning.version.get() + groupId = artifactGroupId + version = wpilibVersioning.version.get() } } } diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle index b916736964..fc93c11dab 100644 --- a/wpilibjIntegrationTests/build.gradle +++ b/wpilibjIntegrationTests/build.gradle @@ -44,7 +44,7 @@ build.dependsOn shadowJar def testOutputFolder = file("${project(':').buildDir}/integrationTestFiles") task copyWpilibJIntegrationTestJarToOutput(type: Copy) { - destinationDir testOutputFolder + destinationDir = testOutputFolder dependsOn shadowJar inputs.file shadowJar.archiveFile from(shadowJar) {