Skip to content

Commit 92e7a96

Browse files
committed
Simplify Gradle; bump TeaVM to 0.15.0-dev-5.
1 parent 952e4fc commit 92e7a96

3 files changed

Lines changed: 7 additions & 17 deletions

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.3.0"
33
rell = "0.16.0"
4-
teavm = "0.15.0-dev-3"
4+
teavm = "0.15.0-dev-5"
55
node-gradle = "7.1.0"
66

77
[libraries]

settings.gradle.kts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,33 @@ pluginManagement {
66
repositories {
77
mavenCentral()
88
gradlePluginPortal()
9-
// TeaVM dev builds (e.g. 0.15.0-dev-N) ship here, not Maven Central.
109
maven("https://teavm.org/maven/repository/") { name = "teavm-dev" }
1110
}
1211
}
1312

1413
dependencyResolutionManagement {
15-
// PREFER (not FAIL) project repos: the node-gradle plugin registers a "Node.js" ivy-style
16-
// repository in :web's build script for Node downloads, and FAIL_ON_PROJECT_REPOS would
17-
// reject it. PREFER keeps settings as the default for Maven artifacts while letting
18-
// plugins layer their own download sources on top.
1914
repositoriesMode = RepositoriesMode.PREFER_SETTINGS
2015

2116
repositories {
2217
mavenCentral()
23-
// TeaVM dev artifacts (teavm-jso, teavm-jso-apis, teavm-core at 0.15.0-dev-N) live here.
2418
maven("https://teavm.org/maven/repository/") { name = "teavm-dev" }
2519
maven("https://gitlab.com/api/v4/projects/50818999/packages/maven") { name = "chromia-parent" }
2620
maven("https://gitlab.com/api/v4/projects/32294340/packages/maven") { name = "postchain" }
2721
maven("https://gitlab.com/api/v4/projects/64941451/packages/maven") { name = "chromia-cli-tools" }
2822
maven("https://gitlab.com/api/v4/projects/46288950/packages/maven") { name = "chromia-misc" }
2923
maven("https://gitlab.com/api/v4/projects/32802097/packages/maven") { name = "rell" }
24+
3025
// node-gradle uses an ivy-pattern lookup against nodejs.org/dist; declare it in
3126
// settings so PREFER_SETTINGS resolves it instead of the plugin's project-scoped
3227
// attempt (which our chromia gitlab repos obviously can't serve).
3328
ivy {
3429
name = "Node.js"
3530
setUrl("https://nodejs.org/dist")
36-
patternLayout {
37-
artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
38-
}
31+
patternLayout { artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]") }
3932
metadataSources { artifact() }
4033
content { includeModule("org.nodejs", "node") }
4134
}
4235
}
4336
}
4437

45-
include("bridge")
46-
include("web")
38+
include("bridge", "web")

web/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ val viteBuild by tasks.registering(PnpmTask::class) {
4040
args = listOf("run", "build")
4141

4242
// Drive incremental rebuild from source — Vite handles its own cache, but Gradle needs
43-
// an inputs/outputs declaration to participate in --no-daemon and CI caching.
43+
// an inputs/outputs declaration to participate in caching.
4444
inputs.dir(layout.projectDirectory.dir("src"))
4545
inputs.dir(layout.projectDirectory.dir("public"))
4646
inputs.file(layout.projectDirectory.file("index.html"))
@@ -74,10 +74,8 @@ val typecheck by tasks.registering(PnpmTask::class) {
7474
outputs.upToDateWhen { true }
7575
}
7676

77-
// Vitest integration suite over the TeaVM-compiled bridge JS — loads the 80 MB bridge module
78-
// once per worker and asserts on the JSON envelopes its @JSExport methods return. Bumps the
79-
// V8 heap to 8 GB via NODE_OPTIONS because the bridge JS is large enough that the default
80-
// 4 GB ceiling OOMs Vitest's transform step.
77+
// Vitest integration suite over the TeaVM-compiled bridge JS — loads the bridge module
78+
// once per worker and asserts on the JSON envelopes its @JSExport methods return.
8179
val vitestRun by tasks.registering(PnpmTask::class) {
8280
description = "Runs the bridge survival/integration suite (Vitest) against the TeaVM JS."
8381
group = LifecycleBasePlugin.VERIFICATION_GROUP

0 commit comments

Comments
 (0)