Fixing fallbacks for macos Folk

Compiles fine, just stricter defaults
This commit is contained in:
Brian Neumann-Fopiano
2026-02-11 00:01:23 -05:00
parent 25fa2553e5
commit 41888e33f6
3 changed files with 42 additions and 7 deletions

View File

@@ -1,4 +1,5 @@
import de.undercouch.gradle.tasks.download.Download import de.undercouch.gradle.tasks.download.Download
import org.gradle.jvm.toolchain.JavaLanguageVersion
import xyz.jpenilla.runpaper.task.RunServer import xyz.jpenilla.runpaper.task.RunServer
import kotlin.system.exitProcess import kotlin.system.exitProcess
@@ -50,7 +51,7 @@ registerCustomOutputTask("PixelFury", "C://Users/repix/workplace/Iris/1.21.3 - D
registerCustomOutputTask("PixelFuryDev", "C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins") registerCustomOutputTask("PixelFuryDev", "C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins")
// ========================== UNIX ============================== // ========================== UNIX ==============================
registerCustomOutputTaskUnix("CyberpwnLT", "/Users/danielmills/development/server/plugins") registerCustomOutputTaskUnix("CyberpwnLT", "/Users/danielmills/development/server/plugins")
registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/Server/plugins") registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/[Minecraft Server]/plugins")
registerCustomOutputTaskUnix("PixelMac", "/Users/test/Desktop/mcserver/plugins") registerCustomOutputTaskUnix("PixelMac", "/Users/test/Desktop/mcserver/plugins")
registerCustomOutputTaskUnix("CrazyDev22LT", "/home/julian/Desktop/server/plugins") registerCustomOutputTaskUnix("CrazyDev22LT", "/home/julian/Desktop/server/plugins")
// ============================================================== // ==============================================================
@@ -187,6 +188,12 @@ configurations.configureEach {
allprojects { allprojects {
apply<JavaPlugin>() apply<JavaPlugin>()
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.papermc.io/repository/maven-public/")
@@ -234,14 +241,14 @@ allprojects {
} }
} }
if (JavaVersion.current().toString() != "21") { if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
System.err.println() System.err.println()
System.err.println("=========================================================================================================") System.err.println("=========================================================================================================")
System.err.println("You must run gradle on Java 21. You are using " + JavaVersion.current()) System.err.println("You must run gradle on Java 21 or newer. You are using " + JavaVersion.current())
System.err.println() System.err.println()
System.err.println("=== For IDEs ===") System.err.println("=== For IDEs ===")
System.err.println("1. Configure the project for Java 21") System.err.println("1. Configure the project for Java 21 toolchain")
System.err.println("2. Configure the bundled gradle to use Java 21 in settings") System.err.println("2. Configure the bundled gradle to use Java 21+ in settings")
System.err.println() System.err.println()
System.err.println("=== For Command Line (gradlew) ===") System.err.println("=== For Command Line (gradlew) ===")
System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html") System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html")

View File

@@ -1,7 +1,23 @@
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins { plugins {
kotlin("jvm") version embeddedKotlinVersion kotlin("jvm") version embeddedKotlinVersion
} }
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
kotlin {
jvmToolchain(21)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
}
}
repositories { repositories {
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
@@ -13,4 +29,4 @@ dependencies {
implementation("com.github.VolmitSoftware:NMSTools:c88961416f") implementation("com.github.VolmitSoftware:NMSTools:c88961416f")
implementation("io.papermc.paperweight:paperweight-userdev:2.0.0-beta.18") implementation("io.papermc.paperweight:paperweight-userdev:2.0.0-beta.18")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
} }

View File

@@ -1,6 +1,8 @@
import io.github.slimjar.func.slimjarHelper import io.github.slimjar.func.slimjarHelper
import io.github.slimjar.resolver.data.Mirror import io.github.slimjar.resolver.data.Mirror
import org.ajoberstar.grgit.Grgit import org.ajoberstar.grgit.Grgit
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.net.URI import java.net.URI
/* /*
@@ -112,6 +114,16 @@ dependencies {
java { java {
disableAutoTargetJvm() disableAutoTargetJvm()
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
kotlin {
jvmToolchain(21)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
}
} }
sentry { sentry {
@@ -216,4 +228,4 @@ rootProject.tasks.named("prepareKotlinBuildScriptModel") {
sourceSets.main { sourceSets.main {
java.srcDir(generateTemplates.map { it.outputs }) java.srcDir(generateTemplates.map { it.outputs })
} }