merge master back into alpha (#40)

* fix(deps): update dependency mineverse.aust1n46:venturechat to v3 (#39) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update codecov/codecov-action action to v3 (#38) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency com.github.seeseemelk:mockbukkit-v1.19 to v2.145.0 (#37) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency com.fasterxml.jackson.core:jackson-annotations to v2.14.2 (#36) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update plugin com.github.johnrengelman.shadow to v8.1.0 (#35) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency org.bstats:bstats-bukkit to v3.0.1 (#34) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency net.dv8tion:jda to v5.0.0-beta.4 (#33) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency jacoco to v0.8.8 (#32) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update plugin com.moonlitdoor.git-version to v0.1.1 (#31) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update abutler/upload-release-assets digest to b2b56d8 (#30) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update abutler/upload-release-assets digest to b2b56d8 (#30) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(release): 1.0.11 [skip ci] ## [1.0.11](v1.0.10...v1.0.11) (2023-02-28) ### 🐛 Bugfix 🐛 * **deps:** update dependency com.fasterxml.jackson.core:jackson-annotations to v2.14.2 ([#36](#36)) ([10e6d2f](10e6d2f)) * **deps:** update dependency com.github.seeseemelk:mockbukkit-v1.19 to v2.145.0 ([#37](#37)) ([5e4cdbc](5e4cdbc)) * **deps:** update dependency jacoco to v0.8.8 ([#32](#32)) ([c588f2c](c588f2c)) * **deps:** update dependency mineverse.aust1n46:venturechat to v3 ([#39](#39)) ([0ade949](0ade949)) * **deps:** update dependency net.dv8tion:jda to v5.0.0-beta.4 ([#33](#33)) ([bdbafb7](bdbafb7)) * **deps:** update dependency org.bstats:bstats-bukkit to v3.0.1 ([#34](#34)) ([6517cb2](6517cb2)) ### 🔨 Misc. * **deps:** update abutler/upload-release-assets digest to b2b56d8 ([#30](#30)) ([9ee0e92](9ee0e92)) * **deps:** update abutler/upload-release-assets digest to b2b56d8 ([#30](#30)) ([95cfab7](95cfab7)) * **deps:** update codecov/codecov-action action to v3 ([#38](#38)) ([7ffb436](7ffb436)) * **deps:** update plugin com.github.johnrengelman.shadow to v8.1.0 ([#35](#35)) ([70518f9](70518f9)) * **deps:** update plugin com.moonlitdoor.git-version to v0.1.1 ([#31](#31)) ([8089bcb](8089bcb)) --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
BrycensRanch · Feb 28, 2023 · 9eea5e9 · 9eea5e9
1 parent 6bdc314
commit 9eea5e9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -124,7 +124,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
       - name: Upload CodeCov Report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         continue-on-error: true
         with:
           file: "**/build/reports/jacoco/**/*.xml"

diff --git a/.github/workflows/hash-release.yml b/.github/workflows/hash-release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Upload hashes to release
         # I don't exactly trust this random action I found on the internet, but it seems to work.
         # However, along as we use this specific commit, it should be fine.
-        uses: AButler/upload-release-assets@c94805dc72e4b20745f543da0f62eaee7722df7a
+        uses: AButler/upload-release-assets@b2b56d8ca22109e8606ac54603ab60dfb32058a7
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
           files: 'hashes*.txt'
diff --git a/build.gradle b/build.gradle
@@ -10,15 +10,15 @@ buildscript {
 }
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.0'
     id 'net.minecrell.plugin-yml.bukkit' version '0.5.3'
     id "org.cadixdev.licenser" version "0.6.1"
 //    id "com.github.sherter.google-java-format" version "0.9"
     id 'xyz.jpenilla.run-paper' version '2.0.1'
 //    id "com.github.spotbugs" version "5.0.13"
     id 'com.gorylenko.gradle-git-properties' version '2.4.1'
 //    id 'com.palantir.git-version' version '1.0.0'
-    id "com.moonlitdoor.git-version" version "0.1.0"
+    id "com.moonlitdoor.git-version" version "0.1.1"
 
     id 'name.remal.common-ci' version '1.5.0'
 
@@ -204,10 +204,10 @@ dependencies {
     implementation 'cloud.commandframework:cloud-annotations:1.8.1'
     annotationProcessor('cloud.commandframework:cloud-annotations:1.8.1')
     library 'org.projectlombok:lombok:1.18.26';
-    library 'com.fasterxml.jackson.core:jackson-annotations:2.12.5'
+    library 'com.fasterxml.jackson.core:jackson-annotations:2.14.2'
     library 'com.fasterxml.jackson.core:jackson-databind:2.14.2';
     annotationProcessor('org.projectlombok:lombok:1.18.26')
-    annotationProcessor('com.fasterxml.jackson.core:jackson-annotations:2.12.5')
+    annotationProcessor('com.fasterxml.jackson.core:jackson-annotations:2.14.2')
     library 'com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.14.2'
     implementation 'cloud.commandframework:cloud-paper:1.8.1'
     implementation 'cloud.commandframework:cloud-minecraft-extras:1.8.1'
@@ -222,18 +222,18 @@ dependencies {
     compileOnly 'com.palmergames.bukkit:TownyChat:0.45'
 
     // Stealing all your data lmfao
-    compileOnly 'org.bstats:bstats-bukkit:3.0.0'
+    compileOnly 'org.bstats:bstats-bukkit:3.0.1'
     // better http server than spark
     library "io.javalin:javalin-bundle:5.3.2"
     // DiscordSRV, optional dependency
     compileOnly 'com.discordsrv:discordsrv:1.24.0'
 //    // JDA for DiscordSRV
 // Apparently, this is already included in DiscordSRV.
-    implementation("net.dv8tion:JDA:5.0.0-alpha.4") {
+    implementation("net.dv8tion:JDA:5.0.0-beta.4") {
         exclude module: 'opus-java'
     }
     // VentureChat support for chat listening
-    compileOnly "mineverse.aust1n46:venturechat:2.20.1"
+    compileOnly "mineverse.aust1n46:venturechat:3.5.0"
     // ProtocolLib (required by venturechat)
     compileOnly "com.comphenix.protocol:ProtocolLib:4.8.0"
 //    compileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.3'
@@ -248,7 +248,7 @@ dependencies {
 //    testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
     testImplementation 'org.mockito:mockito-core:5.1.1'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.29.0'
+    testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.145.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 shadowJar {

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ description = It's time to upgrade your Towny server
 mcVersion = 1.13
 testServerMCVersion = 1.18.2
 apiVersion = 1.13
-version = 1.0.10
+version = 1.0.11
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -1,4 +1,4 @@
-jacoco { toolVersion = "0.8.7" }
+jacoco { toolVersion = "0.8.8" }
 
 jacocoTestReport {
     reports {