Skip to content

Commit

Permalink
Upgrade Gradle wrapper to version 8.6. (#283)
Browse files Browse the repository at this point in the history
Disable Editorconfig plugin due to incompatibility; compatible version would raise minimum required Java version to 16.
  • Loading branch information
blackwinter committed Feb 6, 2024
1 parent 3d8d0e5 commit 877dd37
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 38 deletions.
42 changes: 21 additions & 21 deletions build.gradle
@@ -1,35 +1,35 @@
plugins {
id 'org.ec4j.editorconfig' version '0.0.3'
//id 'org.ec4j.editorconfig' version '0.0.3'
id 'org.xtext.builder' version '4.0.0'
id 'io.github.0ffz.github-packages' version '1.2.1'
}

editorconfig {
excludes = [
'**/*.diff',
'**/*.err',
'**/*.hprof.txt',
'**/*.out',
'**/*.vsix',
'**/.*',
'**/bin',
'**/generated',
'**/includeBenchmark*100000/expected.json',
'**/node_modules',
'**/out',
'**/output-*',
'**/xtext-gen',
'gradlew*'
]
}
//editorconfig {
// excludes = [
// '**/*.diff',
// '**/*.err',
// '**/*.hprof.txt',
// '**/*.out',
// '**/*.vsix',
// '**/.*',
// '**/bin',
// '**/generated',
// '**/includeBenchmark*100000/expected.json',
// '**/node_modules',
// '**/out',
// '**/output-*',
// '**/xtext-gen',
// 'gradlew*'
// ]
//}

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

editorconfigCheck.dependsOn(editorconfigChecker)
check.dependsOn(editorconfigCheck)
//editorconfigCheck.dependsOn(editorconfigChecker)
check.dependsOn(editorconfigChecker)

subprojects {
ext {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 22 additions & 13 deletions gradlew
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (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.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# 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"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
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
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# 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:
# * DEFAULT_JVM_OPTS, JAVA_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.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
4 changes: 2 additions & 2 deletions metafix-ide/build.gradle
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow' version '4.0.1'
id 'com.github.johnrengelman.shadow' version '8.1.1'
}

dependencies {
Expand Down Expand Up @@ -37,6 +37,6 @@ shadowJar {
'systembundle.properties'
)

classifier = 'ls'
archiveClassifier = 'ls'
append('plugin.properties')
}

0 comments on commit 877dd37

Please sign in to comment.