Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:

docker:
name: Docker image build
# Master only (push or manual dispatch); pull requests skip the image build.
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:9.7.1-jdk25 AS builder
FROM gradle:9.8.0-jdk25 AS builder

WORKDIR /workspace

Expand Down
10 changes: 8 additions & 2 deletions build-logic/src/main/kotlin/webapp-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ sourceSets.named("main") {
// of webapp/package.json and wires up the Node/npm build:
// 1. Configure Node.js to auto-download and point at the webapp/ directory
// 2. Register a buildWebapp task that runs `npm run build` with proper caching
// 3. Make processResources depend on buildWebapp so the compiled webapp output
// is available as XTC module resources (used by @StaticContent annotations)
// 3. Make processResources and processXtcResources depend on buildWebapp so the
// compiled webapp output is available as XTC module resources (used by
// @StaticContent annotations). Both tasks copy the webapp/ resource srcDir.
//
// Projects with only static HTML in webapp/public/ (banking, counter, chess-game)
// skip this block entirely — their content is picked up directly by the srcDir above.
Expand All @@ -55,6 +56,7 @@ if (file("webapp/package.json").exists()) {

val npmInstall = tasks.named("npmInstall")
val processResources = tasks.named("processResources")
val processXtcResources = tasks.named("processXtcResources")

val buildWebapp = tasks.register<NpmTask>("buildWebapp") {
args.set(listOf("run", "build"))
Expand All @@ -75,4 +77,8 @@ if (file("webapp/package.json").exists()) {
processResources {
dependsOn(buildWebapp)
}

processXtcResources {
dependsOn(buildWebapp)
}
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ org.gradle.java.installations.auto-download=true
# Gradle performance optimizations
org.gradle.caching=true
org.gradle.parallel=true
# Parallel IDE sync (Tooling API model building); must be explicit since Gradle 9.8.
org.gradle.tooling.parallel=true
org.gradle.configuration-cache=true

# Node.js download (set to false to use system Node.js)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
52 changes: 41 additions & 11 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading