Improve Gradle toolchain detection and provisioning

This commit is contained in:
lax1dude 2025-05-09 12:48:31 -07:00
parent 4ab256e36e
commit 18679d29ee
21 changed files with 23 additions and 108 deletions

View File

@ -11,11 +11,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -11,11 +11,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -10,11 +10,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -12,11 +12,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -10,11 +10,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -9,11 +9,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -14,11 +14,6 @@ dependencies {
compileOnly(libs.jsr305)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
dependsOn ":voice-rpc-protocol:jar" // Workaround
dependsOn ":backend-rpc-api:jar" // Workaround

View File

@ -2,8 +2,3 @@
plugins {
id "java-library"
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

View File

@ -26,16 +26,15 @@ subprojects {
group = providers.gradleProperty("eaglerxserver.group").get()
version = providers.gradleProperty("eaglerxserver.version").get()
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
}
tasks.withType(Javadoc).configureEach {
options.encoding = "UTF-8"
}
// https://github.com/gradle/gradle/issues/32284
plugins.withId("java") {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
// https://github.com/gradle/gradle/issues/32284
sourceSets.configureEach {
def eclipseCompileClasspath = configurations.resolvable(getTaskName(null, "eclipseCompileClasspath")) {
def compileClasspath = configurations.getByName(getCompileClasspathConfigurationName())
@ -53,6 +52,15 @@ subprojects {
}
}
}
}
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
}
tasks.withType(Javadoc).configureEach {
options.encoding = "UTF-8"
}
}

View File

@ -26,11 +26,6 @@ dependencies {
annotationProcessor(libs.velocity.api)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.named("shadowJar", com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
dependsOn ":protocol-game:jar" // Workaround
dependsOn ":backend-rpc-protocol:jar" // Workaround

View File

@ -14,11 +14,6 @@ dependencies {
annotationProcessor(libs.velocity.api)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
archiveFileName = "EaglerMOTD.jar"

View File

@ -14,11 +14,6 @@ dependencies {
annotationProcessor(libs.velocity.api)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
archiveFileName = "EaglerWeb.jar"

View File

@ -21,11 +21,6 @@ dependencies {
testCompileOnly "com.github.plan-player-analytics:Plan:5.6.2965"
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
archiveFileName = "EaglerXPlan.jar"

View File

@ -4,11 +4,6 @@ plugins {
id "maven-publish"
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
publications {
maven(MavenPublication) {

View File

@ -14,11 +14,6 @@ dependencies {
annotationProcessor(libs.velocity.api)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
archiveFileName = "EaglerXRewind.jar"

View File

@ -1,4 +1,10 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
}
rootProject.name = "eaglerxserver"
include "api"
include "api-bukkit"
include "api-bungee"

View File

@ -7,9 +7,3 @@ dependencies {
compileOnly(libs.guava)
compileOnly(libs.bundles.netty.all)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

View File

@ -8,9 +8,3 @@ dependencies {
compileOnly(libs.bungeecord.api)
compileOnly(libs.bundles.netty.all)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

View File

@ -13,11 +13,6 @@ dependencies {
runtimeOnly(libs.logback)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
dependsOn ":supervisor-protocol:jar" // Workaround
dependsOn ":skin-cache:jar" // Workaround

View File

@ -6,9 +6,3 @@ plugins {
dependencies {
compileOnly(libs.bundles.netty.all)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

View File

@ -6,9 +6,3 @@ plugins {
dependencies {
compileOnly(libs.guava)
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}