Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taah 2022-05-08 16:34:21 -07:00
commit 2b3f146dbb

View File

@ -1,4 +1,3 @@
import java.nio.charset.StandardCharsets
plugins { plugins {
java java
`maven-publish` `maven-publish`
@ -17,8 +16,8 @@ repositories {
} }
dependencies { dependencies {
compileOnly("org.projectlombok:lombok:1.18.22") compileOnly("org.projectlombok:lombok:1.18.24")
annotationProcessor("org.projectlombok:lombok:1.18.22") annotationProcessor("org.projectlombok:lombok:1.18.24")
compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
compileOnly("dev.plex:server:1.1-SNAPSHOT") compileOnly("dev.plex:server:1.1-SNAPSHOT")
compileOnly("dev.morphia.morphia:morphia-core:2.2.6") compileOnly("dev.morphia.morphia:morphia-core:2.2.6")
@ -27,7 +26,7 @@ dependencies {
group = "dev.plex" group = "dev.plex"
version = "1.0" version = "1.0"
description = "The guilds module for Plex" description = "The Guilds module for Plex"
java { java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17)) toolchain.languageVersion.set(JavaLanguageVersion.of(17))
@ -47,11 +46,13 @@ tasks.getByName<Jar>("jar") {
} }
tasks { tasks {
javadoc {
options.memberLevel = JavadocMemberLevel.PRIVATE
}
compileJava { compileJava {
options.encoding = StandardCharsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
options.release.set(17)
} }
} javadoc {
options.encoding = Charsets.UTF_8.name()
}
processResources {
filteringCharset = Charsets.UTF_8.name()
}
}