Update gradle (#7)

2024-07-11 10:29:04 -04:00
1 parent 22e35ff81a
commit a66c1e008b
@@ -1,21 +1,3 @@
-# User-specific stuff
-.idea/
-.classpath
-.project
-.settings
-
-*.iml
-*.ipr
-*.iws
-
-out/
-bin/
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
 # Compiled class file
 *.class

@@ -25,6 +7,9 @@ atlassian-ide-plugin.xml
 # BlueJ files
 *.ctxt

+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
 # Package Files #
 *.jar
 *.war
@@ -36,86 +21,17 @@ atlassian-ide-plugin.xml

 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+replay_pid*

-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
+# macOS system files
 .DS_Store
-.AppleDouble
-.LSOverride

-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-.gradle
+# gradle build output files
 build/
+.gradle/

-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Cache of project
-.gradletasknamecache
-
-**/build/
-
-# Common working directory
-run/
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+# eclipse project files
+.settings/
+.project
+.classpath
+bin/
@@ -1,3 +1,7 @@
+**1.3.3:**
+
+- Update gradle build.
+
 **1.3.2**:
 - Refactor phantom toggle logic.
 - Enable phantom spawning by default.
@@ -1,101 +0,0 @@
-plugins {
-
-    id 'java' // Tell gradle this is a java project.
-    id 'com.github.johnrengelman.shadow' version '8.1.1' // Import utility to package libraries into .jar file.
-    id 'eclipse'  // Import eclipse plugin for IDE integration. 
-    id 'org.jetbrains.kotlin.jvm' version '1.9.23' // Import kotlin jvm plugin for kotlin/java integration.
-
-}
-
-java {
- 
-	// Declare java version.
- 	sourceCompatibility = JavaVersion.VERSION_17
-
-}
-
-group = 'me.barny1094875'
-version = '2.1.1'
-
-def apiVersion = "1.19" // Declare minecraft server target version.
-
-processResources {
-
-    def props = [
-        version: version,
-        apiVersion: apiVersion,
-    ]
-
-    inputs.properties props // Indicates to rerun if version changes.
-
-    filesMatching("plugin.yml") {
-
-        expand props
-
-    }
-
-}
-
-
-repositories {
-
-    mavenCentral()
-
-    maven {
-
-        url "https://repo.purpurmc.org/snapshots" // Get purpur API from purpur maven repository.
-
-    }
-
-    maven {
-
-        name = "CodeMC"
-        url = uri("https://repo.codemc.io/repository/maven-public/")
-
-    }
-
-    maven {
-
-        name 'enginehub-repo' // Declare a name for the EngineHub repository.
-        url 'https://maven.enginehub.org/repo/' // Import EngineHub repository for WorldGuard API.
-
-    }
-
-}
-
-dependencies {
-
-    compileOnly "org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT" // Declare purpur API version to be packaged.
-    compileOnly "com.sk89q.worldguard:worldguard-bukkit:7.0.8"
-    compileOnly 'de.tr7zw:item-nbt-api-plugin:2.11.2'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' // Declare kotlin library to be packaged.
-
-}
-
-shadowJar {
-
-    minimize()
-    
-}
-
-processResources {
-
-    def props = [version: version]
-    inputs.properties props
-
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-
-        expand props
-
-    }
-
-}
-
-tasks.withType(JavaCompile).configureEach {
-
-    options.compilerArgs += ["-parameters"]
-    options.encoding = 'UTF-8' // Override the system character set with a universal set.
-    options.fork = true // Enable compilation in a separate daemon process.
-
-}
@@ -0,0 +1,98 @@
+plugins {
+    java // Tell gradle this is a java project.
+    id("io.github.goooler.shadow") version "8.1.8"
+    eclipse // Import eclipse plugin for IDE integration.
+    kotlin("jvm") version "1.9.23" // Import kotlin jvm plugin for kotlin/java integration.
+}
+
+java {
+    // Declare java version.
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+group = "me.barny1094875" // Declare bundle identifier.
+version = "1.3.3" // Declare plugin version (will be in .jar).
+val apiVersion = "1.19" // Declare minecraft server target version.
+
+tasks.named<ProcessResources>("processResources") {
+    val props = mapOf(
+        "version" to version,
+        "apiVersion" to apiVersion
+    )
+
+    inputs.properties(props) // Indicates to rerun if version changes.
+
+    filesMatching("plugin.yml") {
+        expand(props)
+    }
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        url = uri("https://repo.purpurmc.org/snapshots")
+    }
+    
+    maven {
+    
+    	url = uri("https://repo.codemc.io/repository/maven-public/")
+    
+    }
+    
+    maven {
+    
+    	url = uri("https://maven.enginehub.org/repo/")
+    
+    }
+}
+
+dependencies {
+    compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT") // Declare purpur API version to be packaged.
+    compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.8") // Import WorldGuard API.
+    compileOnly("de.tr7zw:item-nbt-api-plugin:2.11.2") // Import NBT API.
+    compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.2.3") // Import MiniPlaceholders API.
+}
+
+tasks.withType<AbstractArchiveTask>().configureEach {
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+}
+
+tasks.shadowJar {
+    exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed.
+    minimize()
+}
+
+tasks.jar {
+    dependsOn(tasks.shadowJar)
+    archiveClassifier.set("part")
+}
+
+tasks.shadowJar {
+    archiveClassifier.set("") // Use empty string instead of null
+    from("LICENSE") {
+        into("/")
+    }
+}
+
+tasks.jar {
+    dependsOn("shadowJar")
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.compilerArgs.add("-parameters")
+    options.encoding = "UTF-8"
+    options.isFork = true
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+        vendor = JvmVendorSpec.GRAAL_VM
+    }
+}
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -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,10 +131,13 @@ 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.
@@ -141,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
@@ -149,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
@@ -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" \
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -1 +0,0 @@
-rootProject.name = 'Utilities-OG'
@@ -0,0 +1 @@
+rootProject.name = "Utilities-OG"