Merge pull request #537 from fwcd/gradle-8.5

Update Gradle to 8.5 and Kotlin to 1.9.20
fwcd · Jan 14, 2024 · 1b546ee · 1b546ee
2 parents 5afc433 + cec27ee
commit 1b546ee
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 15 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -41,6 +41,7 @@ private class FileToEdit {
 
         @JvmStatic @AfterClass
         fun tearDown() {
+            compiler.close()
             outputDirectory.delete()
         }
     }
@@ -95,8 +96,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
@@ -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
diff --git 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
@@ -145,15 +145,15 @@ 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
     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
+        # 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" \