Merge branch 'IntellectualSites:main' into main

This commit is contained in:
Telesphoreo 2023-03-16 11:27:35 -05:00 committed by GitHub
commit dbb7270369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions

View File

@ -5,7 +5,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import java.net.URI import java.net.URI
plugins { plugins {
id("io.github.gradle-nexus.publish-plugin") version "1.2.0" id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("xyz.jpenilla.run-paper") version "2.0.1" id("xyz.jpenilla.run-paper") version "2.0.1"
} }
@ -85,8 +85,9 @@ applyCommonConfiguration()
tasks { tasks {
runServer { runServer {
minecraftVersion("1.19") minecraftVersion("1.19.3")
pluginJars(project(":worldedit-bukkit").file("build/libs/FastAsyncWorldEdit-Bukkit-$version.jar")) pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
.toTypedArray())
} }
} }

View File

@ -8,7 +8,7 @@ log4j = "2.19.0"
dummypermscompat = "1.10" dummypermscompat = "1.10"
worldguard-bukkit = "7.0.7" worldguard-bukkit = "7.0.7"
mapmanager = "1.8.0-SNAPSHOT" mapmanager = "1.8.0-SNAPSHOT"
griefprevention = "16.18" griefprevention = "16.18.1"
griefdefender = "2.1.0-SNAPSHOT" griefdefender = "2.1.0-SNAPSHOT"
residence = "4.5._13.1" residence = "4.5._13.1"
towny = "0.98.4.18" towny = "0.98.4.18"
@ -36,7 +36,7 @@ text = "3.0.4"
piston = "0.5.7" piston = "0.5.7"
# Tests # Tests
mockito = "5.1.1" mockito = "5.2.0"
# Gradle plugins # Gradle plugins
pluginyml = "0.5.3" pluginyml = "0.5.3"

View File

@ -28,7 +28,7 @@ dependencies {
}) })
api("org.apache.logging.log4j:log4j-api") api("org.apache.logging.log4j:log4j-api")
api("org.bstats:bstats-sponge:1.7") api("org.bstats:bstats-sponge:1.7")
testImplementation("org.mockito:mockito-core:5.1.1") testImplementation("org.mockito:mockito-core:5.2.0")
} }
<<<<<<< HEAD <<<<<<< HEAD