Skip to content

Commit 877dd37

Browse files
committed
Upgrade Gradle wrapper to version 8.6. (#283)
Disable Editorconfig plugin due to incompatibility; compatible version would raise minimum required Java version to 16.
1 parent 3d8d0e5 commit 877dd37

File tree

6 files changed

+50
-38
lines changed

6 files changed

+50
-38
lines changed

build.gradle

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
plugins {
2-
id 'org.ec4j.editorconfig' version '0.0.3'
2+
//id 'org.ec4j.editorconfig' version '0.0.3'
33
id 'org.xtext.builder' version '4.0.0'
44
id 'io.github.0ffz.github-packages' version '1.2.1'
55
}
66

7-
editorconfig {
8-
excludes = [
9-
'**/*.diff',
10-
'**/*.err',
11-
'**/*.hprof.txt',
12-
'**/*.out',
13-
'**/*.vsix',
14-
'**/.*',
15-
'**/bin',
16-
'**/generated',
17-
'**/includeBenchmark*100000/expected.json',
18-
'**/node_modules',
19-
'**/out',
20-
'**/output-*',
21-
'**/xtext-gen',
22-
'gradlew*'
23-
]
24-
}
7+
//editorconfig {
8+
// excludes = [
9+
// '**/*.diff',
10+
// '**/*.err',
11+
// '**/*.hprof.txt',
12+
// '**/*.out',
13+
// '**/*.vsix',
14+
// '**/.*',
15+
// '**/bin',
16+
// '**/generated',
17+
// '**/includeBenchmark*100000/expected.json',
18+
// '**/node_modules',
19+
// '**/out',
20+
// '**/output-*',
21+
// '**/xtext-gen',
22+
// 'gradlew*'
23+
// ]
24+
//}
2525

2626
task editorconfigChecker(type: Exec, group: 'Verification') {
2727
executable 'misc/bin/editorconfig-checker'
2828
args('-exclude', '/bin/|/\\.|^gradlew.*|^LICENSE$|^\\.project$')
2929
}
3030

31-
editorconfigCheck.dependsOn(editorconfigChecker)
32-
check.dependsOn(editorconfigCheck)
31+
//editorconfigCheck.dependsOn(editorconfigChecker)
32+
check.dependsOn(editorconfigChecker)
3333

3434
subprojects {
3535
ext {

gradle/wrapper/gradle-wrapper.jar

2.9 KB
Binary file not shown.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

gradlew

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

metafix-ide/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.github.johnrengelman.shadow' version '4.0.1'
2+
id 'com.github.johnrengelman.shadow' version '8.1.1'
33
}
44

55
dependencies {
@@ -37,6 +37,6 @@ shadowJar {
3737
'systembundle.properties'
3838
)
3939

40-
classifier = 'ls'
40+
archiveClassifier = 'ls'
4141
append('plugin.properties')
4242
}

0 commit comments

Comments
 (0)