Clean up the build.gradle files a little bit

2008Choco · Sep 27, 2023 · 722c413 · 722c413
1 parent 0069a6c
commit 722c413
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,24 +1,23 @@
 plugins {
-    id 'base'
     id 'eclipse'
     id 'maven-publish'
     id "io.freefair.aggregate-javadoc" version "6.5.0.3"
 }
 
 allprojects {
-    group 'wtf.choco' // Group for each version
-    version '2.2.0' // Global version applied to all projects
+    group 'wtf.choco'
+    version '2.2.0'
 
     tasks.withType(JavaCompile) {
         options.encoding 'UTF-8'
     }
 }
 
 subprojects {
-    apply plugin: 'java-library'
+    apply plugin: 'java'
     apply plugin: 'checkstyle'
 
-    repositories { // Repos applied to all sub projects
+    repositories {
         mavenCentral()
     }
 
@@ -29,31 +28,26 @@ subprojects {
     java {
         withJavadocJar()
         withSourcesJar()
-    }
 
-    def javadocConfig = {
-        options {
-            links(
-                'https://docs.oracle.com/en/java/javase/17/docs/api/',
-                'https://hub.spigotmc.org/javadocs/spigot/'
-            )
-
-            tags(
-                "apiNote:a:API Note:",
-                "implSpec:a:Implementation Specification:",
-                "implNote:a:Implementation Note:"
-            )
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 
-    javadoc { configure javadocConfig }
-    aggregateJavadoc { configure javadocConfig }
+    aggregateJavadoc {
+        options.links(
+            'https://docs.oracle.com/en/java/javase/17/docs/api/',
+            'https://hub.spigotmc.org/javadocs/spigot/'
+        )
 
-    checkstyleMain {
-        configFile = file("${rootDir}/checkstyle.xml")
+        options.tags(
+            "apiNote:a:API Note:",
+            "implSpec:a:Implementation Specification:",
+            "implNote:a:Implementation Note:"
+        )
     }
 
-    checkstyleTest {
+    tasks.withType(Checkstyle) {
         configFile = file("${rootDir}/checkstyle.xml")
     }
 }

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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,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
@@ -198,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" \

diff --git a/veinminer-bukkit/build.gradle b/veinminer-bukkit/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.*
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 javadoc {

diff --git a/veinminer-common/build.gradle b/veinminer-common/build.gradle
@@ -1,9 +1,3 @@
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
-
 test {
     useJUnitPlatform()
 }