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: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v7

- name: Set up JDK 25
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '25'
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,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

# Platform keystore password
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.

5 changes: 3 additions & 2 deletions kernel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ dependencies {
xtcModule(projects.platformDB)
}

// Process cfg.json template with port overrides if set
tasks.named<ProcessResources>("processResources") {
// Process cfg.json template with port overrides if set. This must be the XTC resource
// task: its output is what compileXtc embeds and what cfgJsonElements exports.
tasks.processXtcResources {
val httpPort = providers.gradleProperty("platform.httpPort")
val httpsPort = providers.gradleProperty("platform.httpsPort")

Expand Down
6 changes: 5 additions & 1 deletion platformUI/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ sourceSets {
}
}

// Make processResources depend on GUI build
// Make processResources and processXtcResources depend on GUI build; both copy guiDistDir
val processResources = tasks.named("processResources") {
dependsOn(buildGui)
}

tasks.processXtcResources {
dependsOn(buildGui)
}
Loading