Release 1.0.5 (#93)

eldoriarpg · Jun 16, 2023 · 5890d21 · 5890d21
2 parents a8cf3a2 + a413827
commit 5890d21
Show file tree

Hide file tree

Showing 14 changed files with 237 additions and 205 deletions.
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -3,7 +3,7 @@ name: Javadocs
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
           echo "Creating .nojekyll to have Github pages deploy html as is:"
           touch .nojekyll
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: companies-api/build/docs/javadoc # The folder the action should deploy.
diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - main
       - dev*
       - feature/*
       - release/*
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,13 +3,13 @@ import de.chojo.PublishData
 
 plugins {
     java
-    id("com.diffplug.spotless") version "6.16.0"
-    id("de.chojo.publishdata") version "1.2.4"
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.publishdata)
     `maven-publish`
 }
 
 group = "de.eldoria"
-version = "1.0.4"
+version = "1.0.5"
 
 subprojects {
     apply {
@@ -37,12 +37,14 @@ allprojects {
 
 
     dependencies {
-        compileOnly("io.papermc.paper", "paper-api", "1.19.4-R0.1-SNAPSHOT")
-        compileOnly("org.jetbrains", "annotations", "24.0.1")
+        val libs = rootProject.libs
+        val testlibs = rootProject.testlibs
+        compileOnly(libs.paper.latest)
+        compileOnly(libs.jetbrains.annotations)
 
-        testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
-        testImplementation(platform("org.junit:junit-bom:5.9.2"))
-        testImplementation("com.github.seeseemelk", "MockBukkit-v1.16", "1.5.2")
+        testImplementation(libs.spigot.v16)
+        testImplementation(platform("org.junit:junit-bom:5.9.3"))
+        testImplementation(testlibs.mockbukkit)
         testImplementation("org.junit.jupiter", "junit-jupiter")
     }
 

diff --git a/companies-api/build.gradle.kts b/companies-api/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 

diff --git a/companies-core/build.gradle.kts b/companies-core/build.gradle.kts
@@ -5,42 +5,26 @@ plugins {
 
 dependencies {
     api(project(":companies-api"))
-    api("de.chojo.sadu", "sadu-queries", "1.3.0")
-    api("de.chojo.sadu", "sadu-updater", "1.3.0")
-    api("de.chojo.sadu", "sadu-datasource", "1.3.0")
-    api("de.chojo.sadu", "sadu-postgresql", "1.3.0")
-    api("de.chojo.sadu", "sadu-mariadb", "1.3.0")
-    api("de.chojo.sadu", "sadu-sqlite", "1.3.0")
+    api(libs.bundles.sadu)
 
-    api("de.eldoria.util", "jackson-configuration", "2.0.0-DEV") {
+    api(libs.bundles.eldoria.utilities) {
         exclude("com.fasterxml.jackson.dataformat")
         exclude("com.fasterxml.jackson.core")
         exclude("com.fasterxml.jackson")
-    }
-    api("de.eldoria.util", "plugin", "2.0.0-DEV"){
         exclude("net.kyori")
     }
-    api("de.eldoria.util", "threading", "2.0.0-DEV")
-    api("de.eldoria.util", "updater", "2.0.0-DEV")
-    api("de.eldoria", "messageblocker", "1.1.2")
+    api(libs.messageblocker)
 
-    compileOnly("com.comphenix.protocol", "ProtocolLib", "4.8.0")
-    compileOnly("me.clip", "placeholderapi", "2.11.3")
-    compileOnly("com.github.MilkBowl", "VaultAPI", "1.7.1")
+    compileOnly(libs.protocollib)
+    compileOnly(libs.papi)
+    compileOnly(libs.vault)
 
-    compileOnly("net.kyori", "adventure-api", "4.12.0")
-    compileOnly("net.kyori", "adventure-platform-bukkit", "4.2.0")
+    compileOnly(libs.bundles.adventure)
 
-    compileOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.14.2")
-    compileOnly("com.fasterxml.jackson.core", "jackson-core", "2.14.2")
-    compileOnly("com.fasterxml.jackson.core:jackson-databind:2.14.2")
+    compileOnly(libs.bundles.jackson)
 
     // database
-    compileOnly("com.zaxxer", "HikariCP", "5.0.1")
-    compileOnly("org.mariadb.jdbc", "mariadb-java-client", "3.1.2")
-    compileOnly("org.xerial", "sqlite-jdbc", "3.41.2.1")
-    compileOnly("org.postgresql", "postgresql", "42.5.4")
+    compileOnly(libs.bundles.database)
 
-    testImplementation("net.kyori", "adventure-api", "4.12.0")
-    testImplementation("net.kyori", "adventure-platform-bukkit", "4.2.0")
+    testImplementation(libs.bundles.adventure)
 }
diff --git a/companies-core/src/main/java/de/eldoria/companies/util/RollingCache.java b/companies-core/src/main/java/de/eldoria/companies/util/RollingCache.java
diff --git a/companies-spigot-latest/build.gradle.kts b/companies-spigot-latest/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("net.minecrell.plugin-yml.bukkit") version "0.5.3"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.pluginyml.bukkit)
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -12,19 +12,18 @@ dependencies {
         exclude("org.slf4j")
     }
     // text
-    bukkitLibrary("net.kyori", "adventure-api", "4.12.0")
-    bukkitLibrary("net.kyori", "adventure-platform-bukkit", "4.2.0")
-
-    bukkitLibrary("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.14.2")
-    bukkitLibrary("com.fasterxml.jackson.core", "jackson-core", "2.14.2")
-    bukkitLibrary("com.fasterxml.jackson.core:jackson-databind:2.14.2")
+    bukkitLibrary(libs.adventure.bukkit)
+    bukkitLibrary(libs.adventure.minimessage)
 
+    bukkitLibrary(libs.jackson.yaml)
+    bukkitLibrary(libs.jackson.core)
+    bukkitLibrary(libs.jackson.databind)
 
     // database
-    bukkitLibrary("com.zaxxer", "HikariCP", "5.0.1")
-    bukkitLibrary("org.mariadb.jdbc", "mariadb-java-client", "3.1.2")
-    bukkitLibrary("org.xerial", "sqlite-jdbc", "3.41.2.1")
-    bukkitLibrary("org.postgresql", "postgresql", "42.5.4")
+    bukkitLibrary(libs.postgres)
+    bukkitLibrary(libs.mariadb)
+    bukkitLibrary(libs.sqlite)
+    bukkitLibrary(libs.hikari)
 }
 
 publishData {

diff --git a/companies-spigot-legacy/build.gradle.kts b/companies-spigot-legacy/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("net.minecrell.plugin-yml.bukkit") version "0.5.3"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.pluginyml.bukkit)
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -13,18 +13,13 @@ dependencies {
     }
 
     // text
-    implementation("net.kyori", "adventure-api", "4.12.0")
-    implementation("net.kyori", "adventure-platform-bukkit", "4.2.0")
+    implementation(libs.adventure.minimessage)
+    implementation(libs.adventure.bukkit)
 
-    implementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.14.2")
-    implementation("com.fasterxml.jackson.core", "jackson-core", "2.14.2")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
+    implementation(libs.bundles.jackson)
 
     // database
-    bukkitLibrary("com.zaxxer", "HikariCP", "5.0.1")
-    bukkitLibrary("org.mariadb.jdbc", "mariadb-java-client", "3.1.2")
-    bukkitLibrary("org.xerial", "sqlite-jdbc", "3.41.2.1")
-    bukkitLibrary("org.postgresql", "postgresql", "42.5.4")
+    bukkitLibrary(libs.bundles.database)
 }
 
 

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,5 +1,6 @@
 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.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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
         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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 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
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.