Modernize Gradle to fix #776 (#781)

- modernize gradle use - fix some gradle deprecations - update to gradle 8.5 Signed-off-by: Christian Dietrich <[email protected]>
eclipse-lsp4j · Feb 12, 2024 · fc5de60 · fc5de60
1 parent 56100e1
commit fc5de60
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:6.3.1"
+		classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
 		classpath "org.xtext:xtext-gradle-plugin:4.0.0"
 	}
 }

diff --git a/gradle/java-compiler-settings.gradle b/gradle/java-compiler-settings.gradle
@@ -10,7 +10,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
  ******************************************************************************/
 
-sourceCompatibility = '11'
+java {
+	sourceCompatibility = JavaVersion.VERSION_11
+}
 
 tasks.withType(Javadoc) {
 	options.addStringOption('Xdoclint:none', '-quiet')

diff --git a/gradle/manifest-gen.gradle b/gradle/manifest-gen.gradle
@@ -18,7 +18,7 @@ else if (baseVersion.split('\\.').length == 4)
 	baseVersion = baseVersion.substring(0, baseVersion.lastIndexOf('.'))
 def qualifiedVersion = baseVersion + '.v' + buildTime
 
-jar.bnd (
+jar.bundle.bnd (
 	'Bundle-Version': qualifiedVersion,
 	'Bundle-Vendor': 'Eclipse LSP4J',
 	'Bundle-RequiredExecutionEnvironment': 'JavaSE-11',

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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -83,10 +83,8 @@ done
 # 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"'
+# 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
@@ -133,26 +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=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
@@ -197,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" \

diff --git a/org.eclipse.lsp4j.debug/build.gradle b/org.eclipse.lsp4j.debug/build.gradle
@@ -22,6 +22,6 @@ dependencies {
 	testImplementation "com.tngtech.archunit:archunit:$versions.archunit"
 }
 
-jar.bnd (
+jar.bundle.bnd (
 	'Import-Package': "com.google.gson.*;version=\"$versions.gson\",*",
 )
diff --git a/org.eclipse.lsp4j.generator/build.gradle b/org.eclipse.lsp4j.generator/build.gradle
@@ -18,6 +18,6 @@ dependencies {
 	api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtend_lib"
 }
 
-jar.bnd (
+jar.bundle.bnd (
 	'Import-Package': "com.google.common.*;version=\"$versions.guava\",com.google.gson.*;version=\"$versions.gson\",*"
 )
diff --git a/org.eclipse.lsp4j.jsonrpc.debug/build.gradle b/org.eclipse.lsp4j.jsonrpc.debug/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 	testImplementation "junit:junit:$versions.junit"
 }
 
-jar.bnd(
+jar.bundle.bnd(
 	'Import-Package': "com.google.gson.*;version=\"$versions.gson\",*"
 )
 
diff --git a/org.eclipse.lsp4j.jsonrpc/build.gradle b/org.eclipse.lsp4j.jsonrpc/build.gradle
@@ -18,6 +18,6 @@ dependencies {
 	testImplementation "junit:junit:$versions.junit"
 }
 
-jar.bnd(
+jar.bundle.bnd(
 	'Import-Package': "com.google.gson.*;version=\"$versions.gson\",*"
 )
diff --git a/org.eclipse.lsp4j.websocket.jakarta/build.gradle b/org.eclipse.lsp4j.websocket.jakarta/build.gradle
@@ -19,6 +19,6 @@ dependencies {
 	testImplementation "junit:junit:$versions.junit"
 }
 
-jar.bnd (
+jar.bundle.bnd (
 	'Import-Package': '*'
 )
diff --git a/org.eclipse.lsp4j.websocket/build.gradle b/org.eclipse.lsp4j.websocket/build.gradle
@@ -19,6 +19,6 @@ dependencies {
 	testImplementation "junit:junit:$versions.junit"
 }
 
-jar.bnd(
+jar.bundle.bnd(
 	'Import-Package': '*'
 )
diff --git a/org.eclipse.lsp4j/build.gradle b/org.eclipse.lsp4j/build.gradle
@@ -13,8 +13,10 @@
 ext.title = 'LSP4J'
 description = 'Java bindings for the Language Server Protocol'
 
-sourceCompatibility = '11'
-targetCompatibility = '11'
+java {
+	sourceCompatibility = JavaVersion.VERSION_11
+	targetCompatibility = JavaVersion.VERSION_11
+}
 
 dependencies {
 	compileOnly project(":org.eclipse.lsp4j.generator")
@@ -24,6 +26,6 @@ dependencies {
 	testImplementation "com.tngtech.archunit:archunit:$versions.archunit"
 }
 
-jar.bnd (
+jar.bundle.bnd (
 	'Import-Package': "com.google.gson.*;version=\"$versions.gson\",*"
 )