This commit is contained in:
Brian Neumann-Fopiano
2026-04-13 17:06:29 -04:00
parent bf207b7062
commit 568fb07f66
8 changed files with 47 additions and 26 deletions
+15 -5
View File
@@ -45,6 +45,8 @@ def lib = 'art.arcane.iris.util'
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate')
.orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')
.get()
String sentryAuthToken = findProperty('sentry.auth.token') as String ?: System.getenv('SENTRY_AUTH_TOKEN')
boolean hasSentryAuthToken = sentryAuthToken != null && !sentryAuthToken.isBlank()
/**
* Dependencies.
@@ -79,7 +81,7 @@ dependencies {
compileOnly(libs.multiverseCore)
// Shaded
implementation('de.crazydev22.slimjar.helper:spigot:2.1.5')
implementation('de.crazydev22.slimjar.helper:spigot:2.1.9')
implementation(volmLibCoordinate) {
changing = true
transitive = false
@@ -123,14 +125,14 @@ dependencies {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
}
}
kotlin {
jvmToolchain(21)
jvmToolchain(25)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.fromTarget('25'))
}
}
@@ -141,7 +143,7 @@ sentry {
org = 'sentry'
projectName = 'iris'
authToken = findProperty('sentry.auth.token') as String ?: System.getenv('SENTRY_AUTH_TOKEN')
authToken = sentryAuthToken
}
slimJar {
@@ -271,6 +273,14 @@ tasks.named('generateSentryBundleIdJava').configure {
dependsOn(generateTemplates)
}
tasks.matching { Task task ->
task.name.startsWith('sentry') || task.name.startsWith('generateSentry')
}.configureEach {
onlyIf {
hasSentryAuthToken
}
}
rootProject.tasks.matching {
it.name == 'prepareKotlinBuildScriptModel'
}.configureEach {
@@ -156,19 +156,19 @@ public final class Tasks {
private static final Task JAVA = Task.of("java", () -> {
int version = Iris.getJavaVersion();
if (version == 21) {
if (version == 25) {
return withDiagnostics(Mode.STABLE);
}
if (version > 21) {
if (version > 25) {
return withDiagnostics(Mode.STABLE,
Diagnostic.Logger.INFO.create("Java Runtime"),
Diagnostic.Logger.INFO.create("- Running Java " + version + ". Iris is tested primarily on Java 21."));
Diagnostic.Logger.INFO.create("- Running Java " + version + ". Iris is tested primarily on Java 25."));
}
return withDiagnostics(Mode.WARNING,
Diagnostic.Logger.WARN.create("Unsupported Java version"),
Diagnostic.Logger.WARN.create("- Java 21+ is recommended. Current runtime: Java " + version));
Diagnostic.Logger.WARN.create("- Java 25+ is recommended. Current runtime: Java " + version));
});
private static final List<Task> TASKS = List.of(