Skip to content
Snippets Groups Projects
Verified Commit dddde838 authored by Griefed's avatar Griefed :joystick:
Browse files

build: Update siouan-frontend-gradle-plugin and NodeJS version, fix building on macOS

parent 3fda087f
No related branches found
No related tags found
1 merge request!638Multiple clientside-mods additions
Pipeline #9220 passed
...@@ -371,6 +371,7 @@ serverpackcreator-web-frontend/.quasar/ ...@@ -371,6 +371,7 @@ serverpackcreator-web-frontend/.quasar/
serverpackcreator-web-frontend/dist/ serverpackcreator-web-frontend/dist/
serverpackcreator-web-frontend/node_modules/ serverpackcreator-web-frontend/node_modules/
serverpackcreator-web-frontend/node/ serverpackcreator-web-frontend/node/
serverpackcreator-web-frontend/.frontend-gradle-plugin
serverpackcreator-app/serverpackcreator.db serverpackcreator-app/serverpackcreator.db
docker-compose-dev.yml docker-compose-dev.yml
......
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType
plugins { plugins {
id("org.siouan.frontend-jdk21") id("org.siouan.frontend-jdk21")
...@@ -11,27 +11,26 @@ repositories { ...@@ -11,27 +11,26 @@ repositories {
frontend { frontend {
packageJsonDirectory.set(project.layout.projectDirectory.asFile) packageJsonDirectory.set(project.layout.projectDirectory.asFile)
nodeVersion.set("18.20.2") nodeVersion.set("20.18.3")
nodeInstallDirectory.set(project.layout.projectDirectory.dir("node")) nodeInstallDirectory.set(project.layout.projectDirectory.dir("node"))
cleanScript.set("run clean")
assembleScript.set("run build") assembleScript.set("run build")
// Print the architecture we are running on. // Print the architecture we are running on.
println(String.format("I am running on: %s", System.getProperty("os.arch"))) println(String.format("I am running on: %s", System.getProperty("os.arch")))
// If we are running on arm, specify Node path pattern so arm-builds succeed.
if (System.getProperty("os.arch").equals("arm")) {
nodeDistributionUrlPathPattern.set("vVERSION/node-vVERSION-linux-armv7l.TYPE")
} else if (System.getProperty("os.arch").equals("aarch64")) {
nodeDistributionUrlPathPattern.set("vVERSION/node-vVERSION-linux-arm64.TYPE")
}
verboseModeEnabled.set(true) verboseModeEnabled.set(true)
} }
tasks.register("installQuasar", RunNpm::class) { tasks.register("installQuasar", RunNpmTaskType::class) {
script.set("install -g @quasar/cli") dependsOn("installCorepackLatest")
args.set("install -g @quasar/cli")
}
//Temporary intermediate task to prevent https://github.com/nodejs/corepack/issues/612#issuecomment-2631491212
//TODO Remove once the error, which caused this task to exist in the first place, is fixed in NodeJS/Corepack
tasks.register("installCorepackLatest", RunNpmTaskType::class) {
args.set("install --global corepack@latest")
} }
tasks.getByName("installNode").finalizedBy( tasks.getByName("installNode").finalizedBy(
......
...@@ -22,7 +22,7 @@ dokka = "1.9.20" ...@@ -22,7 +22,7 @@ dokka = "1.9.20"
licenseReport = "2.9" licenseReport = "2.9"
# https://plugins.gradle.org/plugin/org.siouan.frontend-jdk11 # https://plugins.gradle.org/plugin/org.siouan.frontend-jdk11
frontendPlugin = "8.1.0" frontendPlugin = "10.0.0"
# https://plugins.gradle.org/plugin/com.install4j.gradle # https://plugins.gradle.org/plugin/com.install4j.gradle
install4j = "11.0.0.1" install4j = "11.0.0.1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment