User: rednesto Date: 14 Jul 24 15:04 Revision: 959775f7b173c3233d14f1b8786071a524949af1 Summary: Set all jvm targets to 21 and fix builtin templates destination directory TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9462&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 81e122731bbf2a6e57cdbecb3525dd6a6acb72a5) +++ build.gradle.kts (revision 959775f7b173c3233d14f1b8786071a524949af1) @@ -247,6 +247,7 @@ sandboxContainer.set(layout.projectDirectory.dir(".sandbox")) instrumentCode = false + buildSearchableOptions = false verifyPlugin { ides { @@ -274,14 +275,13 @@ tasks.withType().configureEach { options.encoding = "UTF-8" options.compilerArgs = listOf("-proc:none") - options.release.set(17) + options.release.set(21) } tasks.withType().configureEach { kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - // K2 causes the following error: https://youtrack.jetbrains.com/issue/KT-52786 - freeCompilerArgs = listOf(/*"-Xuse-k2", */"-Xjvm-default=all", "-Xjdk-release=17") + jvmTarget = "21" + freeCompilerArgs = listOf("-Xjvm-default=all") kotlinDaemonJvmArguments.add("-Xmx2G") } } @@ -452,7 +452,7 @@ } from("templates") { exclude(".git") - into("Minecraft Development/lib/resources/builtin-templates") + into("MinecraftDev/lib/resources/builtin-templates") } } @@ -467,14 +467,3 @@ // systemProperty("user.language", "fr") // systemProperty("user.country", "FR") } - -tasks.buildSearchableOptions { - // not working atm - enabled = false -} - -tasks.verifyPluginProjectConfiguration { - // Breaks since IJGP 2.0.0-beta5 :( - setDependsOn(emptyList()) - enabled = false -}