Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 02:25:41 +01:00
Code Issues Projects Releases Wiki Activity

Make tests run on java 21 instead of 17

Browse Source
This commit is contained in:
Ben Woo 2024-10-14 14:18:39 +08:00
parent a226ae5d4a
commit 234d42f1f1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@ -1,19 +1,31 @@
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins { plugins {
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '7.1.2' id 'com.github.johnrengelman.shadow' version '7.1.2'
id "org.jetbrains.kotlin.jvm" version "1.8.10" id "org.jetbrains.kotlin.jvm" version "2.0.21"
} }
version = System.getenv('GITHUB_VERSION') ?: 'local' version = System.getenv('GITHUB_VERSION') ?: 'local'
group = 'org.mvplugins.multiverse.core' group = 'org.mvplugins.multiverse.core'
description = 'Multiverse-Core' description = 'Multiverse-Core'
java { compileJava {
toolchain { sourceCompatibility = JavaVersion.VERSION_17
languageVersion.set(JavaLanguageVersion.of(17)) targetCompatibility = JavaVersion.VERSION_17
}
compileTestJava {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
compileTestKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
javaParameters.set(true)
} }
} }
@ -121,7 +133,7 @@ dependencies {
shadowed 'io.papermc:paperlib:1.0.8' shadowed 'io.papermc:paperlib:1.0.8'
// Tests // Tests
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10' testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21'
testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.20.2' testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.20.2'
testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
exclude group: 'junit', module: 'junit' exclude group: 'junit', module: 'junit'
@ -299,7 +311,7 @@ shadowJar {
configurations = [project.configurations.shadowed] configurations = [project.configurations.shadowed]
archiveFileName = "$baseName-$version.$extension" archiveFileName = "$archiveBaseName-$archiveVersion.$archiveExtension"
dependencies { dependencies {
exclude(dependency { exclude(dependency {

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists