From 02b4ec9fac43fb11fcc984092497af80d88981e0 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Sun, 9 Feb 2025 18:58:58 +0100 Subject: [PATCH] update to gradle 8.12.1 Signed-off-by: Christian Dietrich --- .../full/full.parent/gradle/wrapper/gradle-wrapper.properties | 2 +- .../testdata/wizard-expectations/full/full.parent/gradlew | 3 +-- .../gradle.parent/gradle/wrapper/gradle-wrapper.properties | 2 +- .../testdata/wizard-expectations/gradle/gradle.parent/gradlew | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../lsGradleApp/lsGradleApp.parent/gradlew | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../lsGradleFatjar/lsGradleFatjar.parent/gradlew | 3 +-- .../resources/gradlew/gradle-wrapper.properties | 2 +- org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew | 3 +-- .../eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend | 4 ++-- .../eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java | 2 +- 12 files changed, 13 insertions(+), 18 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradle/wrapper/gradle-wrapper.properties index e2847c82004..e18bc253b85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradle/wrapper/gradle-wrapper.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradlew index 9b87f38bbec..99a47225a8c 100755 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradlew +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/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 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/wrapper/gradle-wrapper.properties index e2847c82004..e18bc253b85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/wrapper/gradle-wrapper.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradlew index 9b87f38bbec..99a47225a8c 100755 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradlew +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/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 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradle/wrapper/gradle-wrapper.properties index e2847c82004..e18bc253b85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradle/wrapper/gradle-wrapper.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradlew index 9b87f38bbec..99a47225a8c 100755 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradlew +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/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 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradle/wrapper/gradle-wrapper.properties index e2847c82004..e18bc253b85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradle/wrapper/gradle-wrapper.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradlew index 9b87f38bbec..99a47225a8c 100755 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradlew +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/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 diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties index e2847c82004..e18bc253b85 100644 --- a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties +++ b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew +++ b/org.eclipse.xtext.xtext.wizard/resources/gradlew/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 diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend index 6fef4a74a0d..a98860c1382 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend @@ -95,10 +95,10 @@ class ParentProjectDescriptor extends ProjectDescriptor { mavenCentral() «IF config.xtextVersion.isSnapshot» maven { - url 'https://oss.sonatype.org/content/repositories/snapshots' + url = 'https://oss.sonatype.org/content/repositories/snapshots' } ««« maven { -««« url 'https://ci.eclipse.org/xtext/job/xtext/job//lastSuccessfulBuild/artifact/build/maven-repository/' +««« url = 'https://ci.eclipse.org/xtext/job/xtext/job//lastSuccessfulBuild/artifact/build/maven-repository/' ««« } «ENDIF» } diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java index 2421495b350..03f549f71f8 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java @@ -172,7 +172,7 @@ public GradleBuildFile buildGradle() { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("url \'https://oss.sonatype.org/content/repositories/snapshots\'"); + _builder.append("url = \'https://oss.sonatype.org/content/repositories/snapshots\'"); _builder.newLine(); _builder.append("\t\t"); _builder.append("}");