#7: add velocity sourceset that builds with java 17

This commit is contained in:
2025-02-07 00:01:43 +01:00
parent 82559d10c6
commit 23527c65a8
+29
View File
@@ -6,12 +6,39 @@ plugins {
group = "me.oskar3123" group = "me.oskar3123"
version = "SNAPSHOT" version = "SNAPSHOT"
// Main sourceSet remains on Java 8
java { java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain { toolchain {
languageVersion.set(JavaLanguageVersion.of(8)) languageVersion.set(JavaLanguageVersion.of(8))
} }
} }
// Create a sourceSet for Velocity code that uses Java 17
sourceSets {
create("velocity") {
java {
srcDir("src/velocity/java")
compileClasspath += sourceSets.main.get().output + sourceSets.main.get().compileClasspath
runtimeClasspath += sourceSets.main.get().output + sourceSets.main.get().runtimeClasspath
}
}
}
// Configure the automatically created Velocity compilation task to use Java 17
tasks.named<JavaCompile>("compileVelocityJava") {
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
}
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven {
@@ -47,6 +74,8 @@ dependencies {
tasks.shadowJar { tasks.shadowJar {
relocate("org.bstats", "me.oskar3123.staffchat.bstats") relocate("org.bstats", "me.oskar3123.staffchat.bstats")
dependsOn("compileVelocityJava")
from(sourceSets["velocity"].output)
} }
tasks.test { tasks.test {