Merge branch 'v6' into v7

# Conflicts:
#	Core/src/main/java/com/plotsquared/core/command/Chat.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegExUtil.java
#	build.gradle.kts
#	gradle/libs.versions.toml
This commit is contained in:
dordsor21
2022-06-16 15:25:33 +01:00
567 changed files with 8048 additions and 11317 deletions

View File

@ -18,10 +18,12 @@ plugins {
idea
}
group = "com.intellectualsites.plotsquared"
version = "7.0.0-SNAPSHOT"
allprojects {
group = "com.intellectualsites.plotsquared"
subprojects {
group = rootProject.group
version = rootProject.version
repositories {
@ -50,9 +52,7 @@ allprojects {
url = uri("https://maven.enginehub.org/repo/")
}
}
}
subprojects {
apply {
plugin<JavaPlugin>()
plugin<JavaLibraryPlugin>()
@ -68,9 +68,7 @@ subprojects {
dependencies {
implementation(platform("com.intellectualsites.bom:bom-newest:1.5"))
}
}
allprojects {
dependencies {
// Tests
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
@ -124,7 +122,7 @@ allprojects {
pom {
name.set(project.name + " " + project.version)
description.set("PlotSquared is a land and world management plugin for Minecraft.")
description.set("PlotSquared, a land and world management plugin for Minecraft.")
url.set("https://github.com/IntellectualSites/PlotSquared")
licenses {
@ -165,7 +163,7 @@ allprojects {
developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
}
issueManagement{
issueManagement {
system.set("GitHub")
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
}
@ -188,7 +186,6 @@ allprojects {
shadowJar {
this.archiveClassifier.set(null as String?)
this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
}
named("build") {
@ -198,7 +195,6 @@ allprojects {
useJUnitPlatform()
}
}
}
nexusPublishing {
@ -209,3 +205,7 @@ nexusPublishing {
}
}
}
tasks.getByName<Jar>("jar") {
enabled = false
}