Update to gradle 8.2.1
This commit is contained in:
parent
fb437cdd0e
commit
3915aadeed
@ -126,5 +126,5 @@ model {
|
|||||||
apply from: 'publish.gradle'
|
apply from: 'publish.gradle'
|
||||||
|
|
||||||
wrapper {
|
wrapper {
|
||||||
gradleVersion '7.5.1'
|
gradleVersion '8.2.1'
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,7 @@ ext.createComponentZipTasks = { components, names, base, type, project, func ->
|
|||||||
def task = project.tasks.create(base + "-${key}", type) {
|
def task = project.tasks.create(base + "-${key}", type) {
|
||||||
description = 'Creates component archive for platform ' + key
|
description = 'Creates component archive for platform ' + key
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
classifier = key
|
archiveClassifier = key
|
||||||
archiveBaseName = '_M_' + base
|
archiveBaseName = '_M_' + base
|
||||||
duplicatesStrategy = 'exclude'
|
duplicatesStrategy = 'exclude'
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ ext.createAllCombined = { list, name, base, type, project ->
|
|||||||
|
|
||||||
list.each {
|
list.each {
|
||||||
if (it.name.endsWith('debug')) return
|
if (it.name.endsWith('debug')) return
|
||||||
from project.zipTree(it.archivePath)
|
from project.zipTree(it.archiveFile)
|
||||||
dependsOn it
|
dependsOn it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
24
gradlew
vendored
24
gradlew
vendored
@ -55,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@ -80,13 +80,10 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
# 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"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@ -133,22 +130,29 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
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
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
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;
|
# Collect all arguments for the java command;
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
1
gradlew.bat
vendored
1
gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
|||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@ -38,8 +38,8 @@ copyAllOutputs.dependsOn outputVersions
|
|||||||
|
|
||||||
ext.addTaskToCopyAllOutputs = { task ->
|
ext.addTaskToCopyAllOutputs = { task ->
|
||||||
copyAllOutputs.dependsOn task
|
copyAllOutputs.dependsOn task
|
||||||
copyAllOutputs.inputs.file task.archivePath
|
copyAllOutputs.inputs.file task.archiveFile
|
||||||
copyAllOutputs.from task.archivePath
|
copyAllOutputs.from task.archiveFile
|
||||||
}
|
}
|
||||||
|
|
||||||
def artifactGroupId = 'com.vendor.frc'
|
def artifactGroupId = 'com.vendor.frc'
|
||||||
@ -51,7 +51,7 @@ def javaBaseName = "_GROUP_com_vendor_frc_ID_${baseArtifactId}-java_CLS"
|
|||||||
task cppHeadersZip(type: Zip) {
|
task cppHeadersZip(type: Zip) {
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
archiveBaseName = zipBaseName
|
archiveBaseName = zipBaseName
|
||||||
classifier = "headers"
|
archiveClassifier = "headers"
|
||||||
|
|
||||||
from(licenseFile) {
|
from(licenseFile) {
|
||||||
into '/'
|
into '/'
|
||||||
@ -65,7 +65,7 @@ task cppHeadersZip(type: Zip) {
|
|||||||
task cppSourceZip(type: Zip) {
|
task cppSourceZip(type: Zip) {
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
archiveBaseName = zipBaseName
|
archiveBaseName = zipBaseName
|
||||||
classifier = "sources"
|
archiveClassifier = "sources"
|
||||||
|
|
||||||
from(licenseFile) {
|
from(licenseFile) {
|
||||||
into '/'
|
into '/'
|
||||||
@ -79,7 +79,7 @@ task cppSourceZip(type: Zip) {
|
|||||||
task cppDriverHeadersZip(type: Zip) {
|
task cppDriverHeadersZip(type: Zip) {
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
archiveBaseName = driverZipBaseName
|
archiveBaseName = driverZipBaseName
|
||||||
classifier = "headers"
|
archiveClassifier = "headers"
|
||||||
|
|
||||||
from(licenseFile) {
|
from(licenseFile) {
|
||||||
into '/'
|
into '/'
|
||||||
@ -98,12 +98,12 @@ build.dependsOn cppDriverHeadersZip
|
|||||||
addTaskToCopyAllOutputs(cppDriverHeadersZip)
|
addTaskToCopyAllOutputs(cppDriverHeadersZip)
|
||||||
|
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
classifier = 'sources'
|
archiveClassifier = 'sources'
|
||||||
from sourceSets.main.allSource
|
from sourceSets.main.allSource
|
||||||
}
|
}
|
||||||
|
|
||||||
task javadocJar(type: Jar, dependsOn: javadoc) {
|
task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||||
classifier = 'javadoc'
|
archiveClassifier = 'javadoc'
|
||||||
from javadoc.destinationDir
|
from javadoc.destinationDir
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,14 +116,14 @@ task outputJar(type: Jar, dependsOn: classes) {
|
|||||||
task outputSourcesJar(type: Jar, dependsOn: classes) {
|
task outputSourcesJar(type: Jar, dependsOn: classes) {
|
||||||
archiveBaseName = javaBaseName
|
archiveBaseName = javaBaseName
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
classifier = 'sources'
|
archiveClassifier = 'sources'
|
||||||
from sourceSets.main.allSource
|
from sourceSets.main.allSource
|
||||||
}
|
}
|
||||||
|
|
||||||
task outputJavadocJar(type: Jar, dependsOn: javadoc) {
|
task outputJavadocJar(type: Jar, dependsOn: javadoc) {
|
||||||
archiveBaseName = javaBaseName
|
archiveBaseName = javaBaseName
|
||||||
destinationDirectory = outputsFolder
|
destinationDirectory = outputsFolder
|
||||||
classifier = 'javadoc'
|
archiveClassifier = 'javadoc'
|
||||||
from javadoc.destinationDir
|
from javadoc.destinationDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user