Skip to content

Commit

Permalink
Make tests run on java 21 instead of 17
Browse files Browse the repository at this point in the history
  • Loading branch information
benwoo1110 committed Oct 14, 2024
1 parent a226ae5 commit 234d42f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
24 changes: 18 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
import org.apache.tools.ant.filters.ReplaceTokens
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'java-library'
id 'maven-publish'
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'
group = 'org.mvplugins.multiverse.core'
description = 'Multiverse-Core'

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
compileJava {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

compileTestJava {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

compileTestKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
javaParameters.set(true)
}
}

Expand Down Expand Up @@ -121,7 +133,7 @@ dependencies {
shadowed 'io.papermc:paperlib:1.0.8'

// 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.googlecode.json-simple:json-simple:1.1.1') {
exclude group: 'junit', module: 'junit'
Expand Down Expand Up @@ -299,7 +311,7 @@ shadowJar {

configurations = [project.configurations.shadowed]

archiveFileName = "$baseName-$version.$extension"
archiveFileName = "$archiveBaseName-$archiveVersion.$archiveExtension"

dependencies {
exclude(dependency {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
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
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 234d42f

Please sign in to comment.