From fa637ed8ddc23b1938978ce08d17be62527ff966 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Sat, 12 Jun 2021 19:31:26 -0500 Subject: [PATCH] Cleanup project build config --- build.gradle.kts | 7 +------ gradle.properties | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c72aad1bc..9c49ca894 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,13 +4,10 @@ plugins { id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT" } -group = "io.papermc.paper" -version = providers.gradleProperty("projectVersion").forUseAtConfigurationTime().get() - val mcVersion = providers.gradleProperty("mcVersion") val packageVersion = providers.gradleProperty("packageVersion") -allprojects { +subprojects { apply(plugin = "java") java { @@ -18,9 +15,7 @@ allprojects { languageVersion.set(JavaLanguageVersion.of(16)) } } -} -subprojects { tasks.withType().configureEach { options.encoding = "UTF-8" options.release.set(16) diff --git a/gradle.properties b/gradle.properties index c26ed1b3d..31b305761 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ +group = "io.papermc.paper" +version = 1.17-R0.1-SNAPSHOT + mcVersion = 1.17 -projectVersion = 1.17-R0.1-SNAPSHOT packageVersion = 1_17_R1 -org.gradle.jvmargs=-Xmx3G