1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-01 10:07:56 +00:00

A few more gametests, update to Gradle 8.12

Okay, listen. I started writing a few more gametests (see #1682), and
then thought I'd do a cheeky Gradle update. However, that broke
vanilla-extract[^1], and also triggered a load of deprecation warnings,
and at that point it was too late to separate the too.

[^1]: 8975ed5a7b
This commit is contained in:
Jonathan Coates
2025-01-12 18:26:51 +00:00
parent 0b389e04b0
commit f881c0ced0
30 changed files with 757 additions and 195 deletions

View File

@@ -13,11 +13,11 @@ plugins {
val modVersion: String by extra
node {
projectRoot.set(rootProject.projectDir)
projectRoot = rootProject.projectDir
}
illuaminate {
version.set(libs.versions.illuaminate)
version = libs.versions.illuaminate
}
sourceSets.register("builder")
@@ -62,8 +62,8 @@ val compileTeaVM by tasks.registering(JavaExec::class) {
)
},
)
mainClass.set("cc.tweaked.web.builder.Builder")
javaLauncher.set(project.javaToolchains.launcherFor { languageVersion.set(java.toolchain.languageVersion) })
mainClass = "cc.tweaked.web.builder.Builder"
javaLauncher = project.javaToolchains.launcherFor { languageVersion = java.toolchain.languageVersion }
}
val rollup by tasks.registering(cc.tweaked.gradle.NpxExecToDir::class) {
@@ -81,7 +81,7 @@ val rollup by tasks.registering(cc.tweaked.gradle.NpxExecToDir::class) {
inputs.file("rollup.config.js").withPropertyName("Rollup config")
// Output directory. Also defined in illuaminate.sexp and rollup.config.js
output.set(layout.buildDirectory.dir("rollup"))
output = layout.buildDirectory.dir("rollup")
args = listOf("rollup", "--config", "rollup.config.js") + if (minify) emptyList() else listOf("--configDebug")
}
@@ -100,7 +100,7 @@ val illuaminateDocs by tasks.registering(cc.tweaked.gradle.IlluaminateExecToDir:
inputs.files(rollup)
// Output directory. Also defined in illuaminate.sexp.
output.set(layout.buildDirectory.dir("illuaminate"))
output = layout.buildDirectory.dir("illuaminate")
args = listOf("doc-gen")
workingDir = rootProject.projectDir
@@ -119,17 +119,15 @@ val htmlTransform by tasks.registering(cc.tweaked.gradle.NpxExecToDir::class) {
inputs.files(illuaminateDocs)
// Output directory.
output.set(layout.buildDirectory.dir(name))
output = layout.buildDirectory.dir(name)
argumentProviders.add {
listOf(
"tsx",
sources.dir.resolve("index.tsx").absolutePath,
illuaminateDocs.get().output.getAbsolutePath(),
sources.dir.resolve("export/index.json").absolutePath,
output.getAbsolutePath(),
)
}
args(
"tsx",
sources.dir.resolve("index.tsx").absolutePath,
illuaminateDocs.get().output.getAbsolutePath(),
sources.dir.resolve("export/index.json").absolutePath,
output.getAbsolutePath(),
)
}
val docWebsite by tasks.registering(Copy::class) {