diff --git a/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.jar index 249e583..ccebba7 100644 Binary files a/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.jar and b/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index da1db5f..d710477 100644 --- a/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/mps-cli-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mps-cli-gradle-plugin/gradlew b/mps-cli-gradle-plugin/gradlew index a69d9cb..79a61d4 100755 --- a/mps-cli-gradle-plugin/gradlew +++ b/mps-cli-gradle-plugin/gradlew @@ -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/. @@ -80,10 +80,10 @@ 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##*/} +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"' @@ -143,12 +143,16 @@ fi 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/mps-cli-gradle-plugin/gradlew.bat b/mps-cli-gradle-plugin/gradlew.bat index f127cfd..93e3f59 100644 --- a/mps-cli-gradle-plugin/gradlew.bat +++ b/mps-cli-gradle-plugin/gradlew.bat @@ -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% diff --git a/mps-cli-gradle-plugin/plugin/build.gradle b/mps-cli-gradle-plugin/plugin/build.gradle index a915a43..94a4370 100644 --- a/mps-cli-gradle-plugin/plugin/build.gradle +++ b/mps-cli-gradle-plugin/plugin/build.gradle @@ -22,8 +22,10 @@ plugins { ext.major = '0' ext.minor = '17' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} repositories { mavenLocal() diff --git a/mps-cli-gradle-plugin/plugin/src/functionalTest/groovy/org/mps_cli/gradle/plugin/LanguagesInformationExtractionTest.groovy b/mps-cli-gradle-plugin/plugin/src/functionalTest/groovy/org/mps_cli/gradle/plugin/LanguagesInformationExtractionTest.groovy index 8b47f2c..a33e7c4 100644 --- a/mps-cli-gradle-plugin/plugin/src/functionalTest/groovy/org/mps_cli/gradle/plugin/LanguagesInformationExtractionTest.groovy +++ b/mps-cli-gradle-plugin/plugin/src/functionalTest/groovy/org/mps_cli/gradle/plugin/LanguagesInformationExtractionTest.groovy @@ -3,8 +3,6 @@ */ package org.mps_cli.gradle.plugin -import org.gradle.internal.impldep.org.glassfish.jaxb.runtime.v2.runtime.property.StructureLoaderBuilder - class LanguagesInformationExtractionTest extends TestBase { def "languages information extraction test"() {