1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-21 15:59:21 +00:00

Bump version to 2.2

This commit is contained in:
Tim203
2022-06-07 23:08:16 +02:00
parent 78254df1de
commit d68c9d6055
2 changed files with 4 additions and 15 deletions

2
Jenkinsfile vendored
View File

@@ -31,7 +31,7 @@ pipeline {
when { when {
anyOf { anyOf {
branch "master" branch "master"
branch "dev/2.1.1" branch "development"
} }
} }

View File

@@ -1,14 +1,12 @@
plugins { plugins {
`java-library` `java-library`
id("floodgate.build-logic") id("floodgate.build-logic")
// id("com.github.spotbugs") version "4.8.0" apply false
id("io.freefair.lombok") version "6.3.0" apply false id("io.freefair.lombok") version "6.3.0" apply false
// checkstyle
} }
allprojects { allprojects {
group = "org.geysermc.floodgate" 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" 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 projects.velocity
).map { it.dependencyProject } ).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 { subprojects {
// apply(plugin = "com.github.spotbugs")
apply { apply {
plugin("java-library") plugin("java-library")
// plugin("checkstyle")
plugin("io.freefair.lombok") plugin("io.freefair.lombok")
plugin("floodgate.build-logic") 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 val relativePath = projectDir.relativeTo(rootProject.projectDir).path
if (relativePath.startsWith("database" + File.separator)) { if (relativePath.startsWith("database" + File.separator)) {