Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Gradle Wrapper to 8.12-rc-1 #453

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=4d9d7ad4cf8842f279649213d2f87d8f7e9a03ae75ac4389517aa574b1404b2a
5 changes: 2 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -203,7 +202,7 @@ 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"'
DEFAULT_JVM_OPTS=

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
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"
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class DebPluginLauncherSpec extends BaseIntegrationTestKitSpec {
id 'com.netflix.nebula.ospackage'
}
buildDeb {
summary 'No copy spec values, but still not up to date'
summary = 'No copy spec values, but still not up to date'
}
'''.stripIndent()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ plugins {
}

task buildRpm(type: Rpm) {
version '1'
version = '1'
from('lib') {
into 'lib'
}
Expand Down Expand Up @@ -225,7 +225,7 @@ def parentExten = project.extensions.create('rpmParent', com.netflix.gradle.plug
version = '1.0'

task buildRpm(type: Rpm) {
packageName 'example'
packageName = 'example'
from(${GradleUtils.quotedIfPresent(srcDir.path)}) {
into('/usr/local/src')
}
Expand Down Expand Up @@ -276,9 +276,8 @@ dependencies {

repositories {
maven {
url {
"file://${reposRootDir}/mavenrepo"
}
url = "file://${reposRootDir}/mavenrepo"

}
}

Expand Down Expand Up @@ -314,7 +313,7 @@ plugins {

task buildRpm(type: Rpm) {
packageName = 'example'
version '3'
version = '3'
from 'package'
}
"""
Expand Down Expand Up @@ -345,7 +344,7 @@ plugins {

task buildRpm(type: Rpm) {
packageName = 'example'
version '4'
version = '4'
from('package') {
into '/lib'
}
Expand Down Expand Up @@ -421,7 +420,7 @@ plugins {
version = '1.0.0'

ospackage {
addParentDirs false
addParentDirs = false
}

buildRpm {
Expand Down Expand Up @@ -455,7 +454,7 @@ plugins {
version = '1.0.0'

ospackage {
addParentDirs false
addParentDirs = false
}

buildRpm {
Expand Down Expand Up @@ -499,7 +498,7 @@ plugins {
version = '1.0.0'

ospackage {
addParentDirs false
addParentDirs = false
setgid = ${setgidValue}
}

Expand Down
Loading