diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/platform/build.gradle.kts b/platform/build.gradle.kts index d0048155c..28d21cfb0 100644 --- a/platform/build.gradle.kts +++ b/platform/build.gradle.kts @@ -6,7 +6,7 @@ javaPlatform { allowDependencies() } -val kotlinVersion = "1.9.10" +val kotlinVersion = "1.9.20" val exposedVersion = "0.37.3" val lsp4jVersion = "0.15.0" diff --git a/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt b/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt index 0c96c094c..8da2aff4d 100644 --- a/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt +++ b/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt @@ -35,6 +35,7 @@ private class FileToEdit { @JvmStatic @AfterClass fun tearDown() { + compiler.close() outputDirectory.delete() } } @@ -89,8 +90,4 @@ private class FileToEdit { assertThat(target.name, hasToString("intFunction")) } - - @After fun cleanUp() { - compiler.close() - } } diff --git a/server/src/test/resources/additionalWorkspace/gradle.properties b/server/src/test/resources/additionalWorkspace/gradle.properties index f1ec025b9..9bb4f614e 100644 --- a/server/src/test/resources/additionalWorkspace/gradle.properties +++ b/server/src/test/resources/additionalWorkspace/gradle.properties @@ -1 +1 @@ -kotlinVersion=1.9.10 +kotlinVersion=1.9.20 diff --git a/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.jar b/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.jar and b/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.jar differ diff --git a/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.properties b/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.properties index ac72c34e8..1af9e0930 100644 --- a/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.properties +++ b/server/src/test/resources/additionalWorkspace/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/server/src/test/resources/additionalWorkspace/gradlew b/server/src/test/resources/additionalWorkspace/gradlew index 0adc8e1a5..1aa94a426 100755 --- a/server/src/test/resources/additionalWorkspace/gradlew +++ b/server/src/test/resources/additionalWorkspace/gradlew @@ -145,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ 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"' -# 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. +# 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" \