diff --git a/Jenkinsfile b/Jenkinsfile index 80976be7..b52cca93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { when { anyOf { branch "master" - branch "dev/2.1.1" + branch "development" } } diff --git a/build.gradle.kts b/build.gradle.kts index c0652297..b64f35aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,14 +1,12 @@ plugins { `java-library` id("floodgate.build-logic") -// id("com.github.spotbugs") version "4.8.0" apply false id("io.freefair.lombok") version "6.3.0" apply false -// checkstyle } allprojects { group = "org.geysermc.floodgate" - version = "2.1.1-SNAPSHOT" + version = "2.2.0-SNAPSHOT" description = "Allows Bedrock players to join Java edition servers while keeping the server in online mode" } @@ -21,25 +19,16 @@ val deployProjects = setOf( projects.velocity ).map { it.dependencyProject } -//todo re-add pmd and organisation/license/sdcm/issuemanagement stuff +//todo re-add checkstyle when we switch back to 2 space indention +// and take a look again at spotbugs someday subprojects { -// apply(plugin = "com.github.spotbugs") - apply { plugin("java-library") -// plugin("checkstyle") plugin("io.freefair.lombok") plugin("floodgate.build-logic") } -// checkstyle { -// toolVersion = "9.3" -// configFile = rootProject.projectDir.resolve("checkstyle.xml") -// maxErrors = 0 -// maxWarnings = 0 -// } - val relativePath = projectDir.relativeTo(rootProject.projectDir).path if (relativePath.startsWith("database" + File.separator)) {