diff --git a/.agents/memory/own-deprecations-your-change-introduces.md b/.agents/memory/own-deprecations-your-change-introduces.md index 3017874..c5cf1ff 100644 --- a/.agents/memory/own-deprecations-your-change-introduces.md +++ b/.agents/memory/own-deprecations-your-change-introduces.md @@ -52,9 +52,9 @@ far from the change that caused it. **Known third-party sources — do not chase these again:** -Two Gradle-10 deprecations fire in every Spine build and originate in -third-party plugins, so no Spine repo can fix them in its own code. Replacing -them is a dedicated dependency-update task, never adapt work: +These deprecations fire in every Spine build and originate in third-party +plugins, so no Spine repo can fix them in its own code. Replacing them is a +dedicated dependency-update task, never adapt work: - `Project.getProperties` — Gradle Doctor (`com.osacky.doctor` 0.12.1), from `DoctorPlugin.apply`. @@ -62,6 +62,9 @@ them is a dedicated dependency-update task, never adapt work: reads `detekt-code-analysis.gradle.kts:67`, which looks like a `config` bug but is the `plugins { id("io.gitlab.arturbosch.detekt") }` line; the call is inside the plugin, which uses it to derive its default reports directory. +- `Configuration.setVisible(boolean)` — the detekt Gradle plugin again, from + `DetektPlugin.configurePluginDependencies`; first reported by Gradle 9.8, + scheduled for removal in Gradle 11. Attribute a warning with `--warning-mode all --stacktrace` and look for an `io.spine.*` or `*_gradle` frame before assuming the deprecation is ours. A diff --git a/.agents/tasks/archive/cascade-refresh-219fef6-testlib.json b/.agents/tasks/archive/cascade-refresh-219fef6-testlib.json new file mode 100644 index 0000000..7ec1a85 --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-219fef6-testlib.json @@ -0,0 +1,78 @@ +{ + "schema": 1, + "wave": "cascade-refresh-219fef6-testlib", + "kind": "refresh", + "created": "2026-10-07T18:29:36Z", + "base": "master", + "config_sha": "219fef6ddd42c1e236dddf04526fb2a64409de6a", + "seed": null, + "target": null, + "branch": "cascade-refresh-219fef6-testlib", + "halted": null, + "order": [ + "base-libraries", + "reflect", + "logging", + "testlib", + "dokka-tools", + "tool-base", + "ProtoTap", + "compiler", + "validation", + "core-jvm-compiler", + "base-types", + "change", + "time", + "money", + "core-jvm", + "jdbc-storage", + "gcloud-jvm", + "delivery-server", + "BuildSpeed" + ], + "repos": { + "testlib": { + "upstreams": [], + "class": "library", + "version_property": "versionToPublish", + "probe": { + "group_path": "io/spine/tools", + "artifact": "base-testlib" + }, + "state": "published-remote", + "target_version": "2.0.0-SNAPSHOT.214", + "pin_vector": {}, + "adapt_rounds": 0, + "built": { + "head": "c6a01c89b167253e105506d035cded35781cbb51", + "at": "2026-10-07T19:06:15Z" + }, + "pr": { + "url": "https://github.com/SpineEventEngine/testlib/pull/14", + "head": "c6a01c89b167253e105506d035cded35781cbb51" + }, + "parked": null + } + }, + "excluded": { + "base-libraries": "excluded by --exclude", + "reflect": "excluded by --exclude", + "logging": "excluded by --exclude", + "dokka-tools": "excluded by --exclude", + "tool-base": "excluded by --exclude", + "ProtoTap": "excluded by --exclude", + "compiler": "excluded by --exclude", + "validation": "excluded by --exclude", + "core-jvm-compiler": "excluded by --exclude", + "base-types": "excluded by --exclude", + "change": "excluded by --exclude", + "time": "excluded by --exclude", + "money": "excluded by --exclude", + "core-jvm": "excluded by --exclude", + "jdbc-storage": "excluded by --exclude", + "gcloud-jvm": "excluded by --exclude", + "delivery-server": "excluded by --exclude", + "BuildSpeed": "excluded by --exclude" + }, + "closing_pr": "https://github.com/SpineEventEngine/config/pull/785" +} diff --git a/.agents/tasks/archive/cascade-refresh-219fef6-testlib.md b/.agents/tasks/archive/cascade-refresh-219fef6-testlib.md new file mode 100644 index 0000000..a066774 --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-219fef6-testlib.md @@ -0,0 +1,19 @@ +--- +slug: cascade-refresh-219fef6-testlib +branch: cascade-refresh-219fef6-testlib +owner: cascade +status: in-progress +started: 2026-10-07 +--- + +# Wave `cascade-refresh-219fef6-testlib` (refresh) + +Machine state: [`cascade-refresh-219fef6-testlib.json`](cascade-refresh-219fef6-testlib.json). Park reasons and decisions land here. + +## Repos + +- [ ] testlib + +## Log + +- 2026-10-07 — wave planned. diff --git a/.agents/tasks/archive/cascade-refresh-219fef6.json b/.agents/tasks/archive/cascade-refresh-219fef6.json new file mode 100644 index 0000000..4681321 --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-219fef6.json @@ -0,0 +1,78 @@ +{ + "schema": 1, + "wave": "cascade-refresh-219fef6", + "kind": "refresh", + "created": "2026-10-07T16:09:23Z", + "base": "master", + "config_sha": "219fef6ddd42c1e236dddf04526fb2a64409de6a", + "seed": null, + "target": null, + "branch": "cascade-refresh-219fef6", + "halted": null, + "order": [ + "base-libraries", + "reflect", + "logging", + "testlib", + "dokka-tools", + "tool-base", + "ProtoTap", + "compiler", + "validation", + "core-jvm-compiler", + "base-types", + "change", + "time", + "money", + "core-jvm", + "jdbc-storage", + "gcloud-jvm", + "delivery-server", + "BuildSpeed" + ], + "repos": { + "reflect": { + "upstreams": [], + "class": "library", + "version_property": "versionToPublish", + "probe": { + "group_path": "io/spine", + "artifact": "spine-reflect" + }, + "state": "published-remote", + "target_version": "2.0.0-SNAPSHOT.201", + "pin_vector": {}, + "adapt_rounds": 1, + "built": { + "head": "791c16c7a70efbd8fdfd7ed8cf4a8598b6c55671", + "at": "2026-10-07T17:48:45Z" + }, + "pr": { + "url": "https://github.com/SpineEventEngine/reflect/pull/14", + "head": "791c16c7a70efbd8fdfd7ed8cf4a8598b6c55671" + }, + "parked": null + } + }, + "excluded": { + "base-libraries": "excluded by --exclude", + "logging": "excluded by --exclude", + "testlib": "excluded by --exclude", + "dokka-tools": "excluded by --exclude", + "tool-base": "excluded by --exclude", + "ProtoTap": "excluded by --exclude", + "compiler": "excluded by --exclude", + "validation": "excluded by --exclude", + "core-jvm-compiler": "excluded by --exclude", + "base-types": "excluded by --exclude", + "change": "excluded by --exclude", + "time": "excluded by --exclude", + "money": "excluded by --exclude", + "core-jvm": "excluded by --exclude", + "jdbc-storage": "excluded by --exclude", + "gcloud-jvm": "excluded by --exclude", + "delivery-server": "excluded by --exclude", + "BuildSpeed": "excluded by --exclude" + }, + "closing_pr": "https://github.com/SpineEventEngine/config/pull/784" +} diff --git a/.agents/tasks/archive/cascade-refresh-219fef6.md b/.agents/tasks/archive/cascade-refresh-219fef6.md new file mode 100644 index 0000000..272e4b7 --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-219fef6.md @@ -0,0 +1,21 @@ +--- +slug: cascade-refresh-219fef6 +branch: cascade-refresh-219fef6 +owner: cascade +status: in-progress +started: 2026-10-07 +--- + +# Wave `cascade-refresh-219fef6` (refresh) + +Machine state: [`cascade-refresh-219fef6.json`](cascade-refresh-219fef6.json). Park reasons and decisions land here. + +## Repos + +- [ ] reflect + +## Log + +- 2026-10-07 — wave planned. +- 2026-10-07 — **parked** `reflect`: buildSrc orphans: config/pull's cp -R overlay left 20 files config no longer ships (Runtime.kt, CoreJava.kt, ArtifactVersion.kt, dokka-for-*.gradle.kts, report/coverage/*, ...) -> 13 :buildSrc compile errors; fix belongs in config migrate's retired-file removal (testlib carries 14 such orphans too) +- 2026-10-07 — resumed `reflect`. diff --git a/.agents/tasks/archive/cascade-refresh-8fddc6f-money.json b/.agents/tasks/archive/cascade-refresh-8fddc6f-money.json new file mode 100644 index 0000000..377135a --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-8fddc6f-money.json @@ -0,0 +1,78 @@ +{ + "schema": 1, + "wave": "cascade-refresh-8fddc6f-money", + "kind": "refresh", + "created": "2026-10-07T19:36:34Z", + "base": "master", + "config_sha": "8fddc6f17507209855ccd33706cca429b2473876", + "seed": null, + "target": null, + "branch": "cascade-refresh-8fddc6f-money", + "halted": null, + "order": [ + "base-libraries", + "reflect", + "logging", + "testlib", + "dokka-tools", + "tool-base", + "ProtoTap", + "compiler", + "validation", + "core-jvm-compiler", + "base-types", + "change", + "time", + "money", + "core-jvm", + "jdbc-storage", + "gcloud-jvm", + "delivery-server", + "BuildSpeed" + ], + "repos": { + "money": { + "upstreams": [], + "class": "library", + "version_property": "versionToPublish", + "probe": { + "group_path": "io/spine", + "artifact": "spine-money" + }, + "state": "published-remote", + "target_version": "2.0.0-SNAPSHOT.12", + "pin_vector": {}, + "adapt_rounds": 0, + "built": { + "head": "eba56701b7ca27859dc90b7af8435fb09ec3a49d", + "at": "2026-10-07T19:54:20Z" + }, + "pr": { + "url": "https://github.com/SpineEventEngine/money/pull/32", + "head": "eba56701b7ca27859dc90b7af8435fb09ec3a49d" + }, + "parked": null + } + }, + "excluded": { + "base-libraries": "excluded by --exclude", + "reflect": "excluded by --exclude", + "logging": "excluded by --exclude", + "testlib": "excluded by --exclude", + "dokka-tools": "excluded by --exclude", + "tool-base": "excluded by --exclude", + "ProtoTap": "excluded by --exclude", + "compiler": "excluded by --exclude", + "validation": "excluded by --exclude", + "core-jvm-compiler": "excluded by --exclude", + "base-types": "excluded by --exclude", + "change": "excluded by --exclude", + "time": "excluded by --exclude", + "core-jvm": "excluded by --exclude", + "jdbc-storage": "excluded by --exclude", + "gcloud-jvm": "excluded by --exclude", + "delivery-server": "excluded by --exclude", + "BuildSpeed": "excluded by --exclude" + }, + "closing_pr": null +} diff --git a/.agents/tasks/archive/cascade-refresh-8fddc6f-money.md b/.agents/tasks/archive/cascade-refresh-8fddc6f-money.md new file mode 100644 index 0000000..f95b521 --- /dev/null +++ b/.agents/tasks/archive/cascade-refresh-8fddc6f-money.md @@ -0,0 +1,20 @@ +--- +slug: cascade-refresh-8fddc6f-money +branch: cascade-refresh-8fddc6f-money +owner: cascade +status: in-progress +started: 2026-10-07 +--- + +# Wave `cascade-refresh-8fddc6f-money` (refresh) + +Machine state: [`cascade-refresh-8fddc6f-money.json`](cascade-refresh-8fddc6f-money.json). Park reasons and decisions land here. + +## Repos + +- [ ] money + +## Log + +- 2026-10-07 — wave planned. +- 2026-10-08 — closed without a `config` PR: `config` has no `Money` pin to advance (no SDK repository depends on `money`). diff --git a/.agents/tasks/toolbase-split-migration.md b/.agents/tasks/toolbase-split-migration.md new file mode 100644 index 0000000..4b32bc9 --- /dev/null +++ b/.agents/tasks/toolbase-split-migration.md @@ -0,0 +1,145 @@ +--- +slug: toolbase-split-migration +branch: toolbase-split-migration +owner: unassigned +status: approved +started: 2026-08-19 +--- + +## Goal + +Migrate every Spine SDK repository that depends on `tool-base` onto the modules +that replaced it, so the SDK builds against `io.spine.tools:*:2.0.0-SNAPSHOT.420` +and later. + +## Context + +[tool-base#189](https://github.com/SpineEventEngine/tool-base/pull/189) (merged +2026-08-19, `43ea6afa`) split the monolithic `tool-base` module into focused +modules and **retired the `io.spine.tools:tool-base` artifact**. The repository +keeps its name; only the module of that name is gone. + +Package names of moved code were preserved wherever possible, so most repositories +need a dependency change and no source edits. The exceptions are listed under +*Tier 1* below. + +| New module | Packages | +|---|---| +| `fs` | `io.spine.tools.fs` | +| `code` | `io.spine.tools.code` | +| `archive` | `io.spine.tools.archive` | +| `kotlin-code` | `io.spine.tools.kotlin` | +| `java-code` | `io.spine.tools.java`, `.java.code`, `.java.fs`, `.java.javadoc` | +| `proto-code` | `io.spine.tools.proto.code`, `.proto.fs`, `.proto.type` | +| `classic-codegen` | `io.spine.tools.java.code.poet`, `.roaster` (JavaPoet/Roaster wrappers only) | + +`js-code` and `dart-code` were extracted during that PR and then **removed** — +JavaScript and Dart are not supported languages in v2.x. + +### Prerequisites + +1. **`2.0.0-SNAPSHOT.420` must be published.** As of 2026-08-19 15:07 UTC it was + not: the `fs` POM returned HTTP 404 from the Artifact Registry. Nothing below + can be verified until it is. +2. **[config#748](https://github.com/SpineEventEngine/config/pull/748)** declares + the new constants and deprecates `ToolBase.lib`. It pins `.420`, so it must + merge *after* the publication and *before* the repositories below are updated — + they take the constants from it. + +`ToolBase.lib` is **deprecated rather than deleted** precisely so these +repositories can migrate one at a time instead of all at once. + +## Plan + +### Tier 1 — source edits required + +These import symbols that moved. Each needs the dependency change *and* the edits. + +- [ ] **`core-jvm-compiler`** (active, 2026-08-18) — 12 edits: + - `io.spine.tools.java.code.{classSpec, constructorSpec, methodSpec, codeBlock}` + → `io.spine.tools.java.code.poet.*`: + `signal/…/rejection/Javadoc.kt:33`, + `RThrowableBuilderCode.kt:63-66`, `RThrowableCode.kt:40-42` + - `…java.code.fullTextNormalized` → `…java.code.roaster.*`: + `signal/…/rejection/RejectionJavadocIgTest.kt:44` + - `io.spine.tools.{div, resolve}` → `io.spine.tools.fs.{div, resolve}`: + `annotation/…/ApiAnnotationsPluginIgTest.kt:45`, + `signal/…/JavadocTestEnv.kt:33`, `signal/…/RejectionCodegenIgTest.kt:38` + +- [ ] **`compiler`** (active, 2026-08-13) — one import: + `protoc-plugin/…/protoc/Plugin.kt:33`, + `io.spine.tools.code.proto.CodeGeneratorRequestWriter` + → `io.spine.tools.proto.code.CodeGeneratorRequestWriter` + +- [ ] **`ProtoTap`** (active, 2026-06-17) — the same single import at + `protoc-plugin/…/protoc/Plugin.kt:33` + +Dormant, one stale `io.spine.tools.type` reference each — likely not worth +migrating: `core-java-1x` (2023-06-29), `model-tools` (2022-10-04). + +### Tier 2 — replace `ToolBase.lib` + +14 repositories reference `ToolBase.lib` **only inside version-forcing blocks** +(`doForceVersions` lists, `resolutionStrategy … .using(module(...))`) and import +nothing from the artifact. The fix is to drop the entry, or replace it with the +specific modules if the forced version still matters: + +- [ ] `base-types` · `bootstrap` · `change` · `core-jvm` · `delivery-server` +- [ ] `dokka-tools` · `gcloud-jvm` · `jdbc-storage` · `logging` · `model-compiler` +- [ ] `reflect` · `time` · `validation` · `web` + +Where a repository does import moved packages, the replacement constants are: + +| Repo | Constants | +|---|---| +| `core-jvm-compiler` | `fs` `code` `kotlinCode` `javaCode` `classicCodegen` `protoCode` | +| `compiler`, `mc-java` | `fs` `code` `kotlinCode` `javaCode` `protoCode` | +| `ProtoData` | `fs` `code` `kotlinCode` `javaCode` | +| `validation`, `model-tools` | `code` | +| `ProtoTap`, `base-libraries`, `core-java-1x` | `protoCode` | +| `javadoc-tools` | `javaCode` | + +### Tier 3 — no action + +`elastic`, `testlib`, `config` reference only `JavadocFilter` and +`protobufSetupPlugins`, neither of which changed. + +## Other breaking changes to watch for + +Not currently used by any repository, but they will bite anyone who adopts them: + +- **`Generated.dir(String)` / `SourceRoot.subDir(String, String)`** replaced the + `SourceSetName` parameter. Extracting `io.spine.tools.fs` was otherwise + impossible — a three-package cycle ran across the cut. The blank-name check + `SourceSetName` performed is preserved inside `SourceRoot.subDir`. +- **`io.spine.tools.OsFamily` is gone.** Base Libraries publishes the same enum as + `io.spine.environment.OsFamily` in its `spine-environment` artifact. +- **`Method(MethodSpec)` is gone**, replaced by `MethodSpec.toMethod()` in + `io.spine.tools.java.code.poet`. +- **`io.spine.tools.{div, resolve, toAbsoluteFile, isProtoSource}`** moved to + `io.spine.tools.fs`. Java callers import the **JVM facade**, which is now + `io.spine.tools.fs.Paths` rather than `io.spine.tools.StandardTypes` — a + spelling that shares no text with the Kotlin package, so it hides from the + obvious grep. +- **`io.spine.tools.type` → `io.spine.tools.proto.type`** required a matching + change to the runtime guard in `KnownTypes.Holder.extendWith`, delivered by + [base-libraries#959](https://github.com/SpineEventEngine/base-libraries/pull/959) + and available from Base `2.0.0-SNAPSHOT.441`. Any repository calling + `MoreKnownTypes` needs that Base version or later, or it throws + `SecurityException` **at runtime** — nothing fails to compile. + +## Verification + +Per repository: `./gradlew clean build`, plus `dokkaGenerate` where the repo +applies Dokka. Two traps met repeatedly during the split, worth repeating here: + +- With `org.gradle.caching=true`, a renamed generated package can be restored from + the build cache, so artifact checks need `--no-build-cache`. +- `clean build` in one invocation is unreliable under `org.gradle.parallel=true`; + run `clean` as its own invocation. + +## Log + +- 2026-08-19 — drafted from the post-merge survey of tool-base#189. Counts and + file/line references were taken from the working tree on that date; re-run the + searches before starting, since several of these repositories are active. diff --git a/.gitignore b/.gitignore index 18ef021..77a55b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,15 @@ # >>> shared config (managed by ./config/pull -- do not edit inside this block) >>> +# Copyright 2026 CodeMatters, Lda. # -# Copyright 2025, TeamDev. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of the License at # # https://www.apache.org/licenses/LICENSE-2.0 # -# Redistribution and use in source and/or binary forms, with or without -# modification, must retain the above copyright notice and the following -# disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# Unless required by applicable law or agreed to in writing, software distributed under +# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the License for the specific language governing permissions +# and limitations under the License. # # This file is used for two purposes: @@ -59,6 +45,10 @@ # indices, external-storage toggles) — so `.idea/*.xml` above keeps it ignored. # `./config/pull` (via `migrate`) untracks any copy an earlier pull committed. +# `.idea/kotlinc.xml` is likewise NOT re-included. It records the Kotlin compiler +# settings IDEA rewrites on its own (JVM target, bundled plugin version), so it +# churns per machine and per IDE build — `.idea/*.xml` above keeps it ignored. + # Do not ignore the following IDEA settings !.idea/codeStyleSettings.xml !.idea/codeStyles/ diff --git a/.idea/copyright/CodeMatters_Open_Source.xml b/.idea/copyright/CodeMatters_Open_Source.xml new file mode 100644 index 0000000..cf5d713 --- /dev/null +++ b/.idea/copyright/CodeMatters_Open_Source.xml @@ -0,0 +1,6 @@ + + + + diff --git a/.idea/live-templates/README.md b/.idea/live-templates/README.md index 9500667..267008a 100644 --- a/.idea/live-templates/README.md +++ b/.idea/live-templates/README.md @@ -22,6 +22,6 @@ In order to add these templates, perform the following steps: 1. Open the corresponding template: `Preferences -> Editor -> Live Templates -> User.todo`. 2. Click on `Edit variables`. -3. Set `USER` variable to your domain email address without `@teamdev.com` ending. For example, +3. Set `USER` variable to your domain email address without `@teamdev.com` ending. For example, for `jack.sparrow@teamdev.com` use the following expression `"jack.sparrow"`. 4. Verify that the template generates expected comments: `// TODO:2022-11-03:jack.sparrow: <...>`. diff --git a/agents b/agents index cd7c275..9043500 160000 --- a/agents +++ b/agents @@ -1 +1 @@ -Subproject commit cd7c275aee61187d685d18ee61a08c9212f153a6 +Subproject commit 904350043f06d64e880f62108b5896a598734f02 diff --git a/base-libraries b/base-libraries index 948b22b..0136aa3 160000 --- a/base-libraries +++ b/base-libraries @@ -1 +1 @@ -Subproject commit 948b22b81d37fbf2e18004b6b37578b046c42b04 +Subproject commit 0136aa36e04eebac3173a4523b079df3c6362ca5 diff --git a/cascade b/cascade index df51d34..2e7493f 100755 --- a/cascade +++ b/cascade @@ -124,9 +124,7 @@ extra_edges() { # Default exclusions, with reasons surfaced by `plan`. excluded_reason() { case "$1" in - documentation) echo "Spine 1.x; not part of the SDK build line" ;; - reflect|money|testlib) - echo "straggler: config submodule generations behind — first pull is a migration (opt in via --include)" ;; + documentation) echo "documentation area of the spine.io site; not part of the SDK build line" ;; *) echo "" ;; esac } @@ -232,9 +230,11 @@ require_submodule() { require_java() { # Validate, never trust: a jenv/profile JAVA_HOME may point at an old JDK # (observed: corretto 11 while the SDK builds on 17 — Gradle refuses). + # `|| true`: under `pipefail` a missing or broken `java` (e.g. JAVA_HOME + # unset) would otherwise abort the script here, before the fallback runs. local want=17 ver ver="$("${JAVA_HOME:-/nonexistent}/bin/java" -version 2>&1 \ - | sed -nE 's/.*version "([0-9]+).*/\1/p' | head -1)" + | sed -nE 's/.*version "([0-9]+).*/\1/p' | head -1 || true)" if ! [ "${ver:-0}" -ge "$want" ] 2>/dev/null; then JAVA_HOME="$(/usr/libexec/java_home -v "$want" 2>/dev/null || true)" fi @@ -686,8 +686,8 @@ EOF done cat <<'EOF' -`documentation` is not on the graph: it is a Spine 1.x site project, not part -of the SDK build line. +`documentation` is not on the graph: it is the documentation area of the +spine.io site, not part of the SDK build line. ## Maintenance @@ -825,12 +825,13 @@ usage: cascade plan --kind refresh|ripple|retarget [--seed [@]] (ripple) [--target ] (retarget) [--include ]... [--exclude ]... + [--slug-suffix ] (distinct name, e.g. one wave per repo) EOF exit 2 } cmd_plan() { - local kind="" seed="" seed_ver="" target="" includes="" excludes="" + local kind="" seed="" seed_ver="" target="" includes="" excludes="" suffix="" while [ $# -gt 0 ]; do case "$1" in --kind) kind="$2"; shift 2 ;; @@ -838,12 +839,15 @@ cmd_plan() { --target) target="$2"; shift 2 ;; --include) includes="$includes $2"; shift 2 ;; --exclude) excludes="$excludes $2"; shift 2 ;; + --slug-suffix) suffix="$2"; shift 2 ;; *) usage_plan ;; esac done case "$kind" in refresh|ripple|retarget) ;; *) usage_plan ;; esac [ "$kind" = ripple ] && [ -z "$seed" ] && usage_plan [ "$kind" = retarget ] && [ -z "$target" ] && usage_plan + # The suffix becomes part of a branch name and a file name. + case "$suffix" in *[!A-Za-z0-9-]*) die "--slug-suffix accepts letters, digits, and '-' only" ;; esac "$0" graph --check @@ -857,6 +861,12 @@ cmd_plan() { ripple) slug="cascade-ripple-$seed-${seed_ver##*.}" ;; retarget) slug="cascade-retarget-$target" ;; esac + [ -z "$suffix" ] || slug="$slug-$suffix" + # A slug must name one wave: `manifest_path` falls back to `archive/`, so a + # reused slug would make the archived wave and the new one indistinguishable. + # Successive single-repo waves against the same `config` commit hit this. + [ ! -f "$TASKS_DIR/archive/$slug.json" ] \ + || die "wave $slug is already archived — plan under a distinct name: --slug-suffix " # Scope. Only forward (wave-ordering) edges scope and order a wave; floor # edges are consumed at last-published versions and impose nothing. @@ -970,7 +980,7 @@ cmd_plan() { target: (if $target == "" then null else $target end), branch: $wave, halted: null, order: $order, repos: $repos, excluded: $excluded, closing_pr: null}' \ - > "$(manifest_path "$slug")" + > "$TASKS_DIR/$slug.json" # Companion task file for humans/agents. local md="$TASKS_DIR/$slug.md" diff --git a/config b/config index ea0d20d..3409e7d 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit ea0d20d951ae670294b63dcba1a0b02eccce1198 +Subproject commit 3409e7dd193e8cb7da82467d01039140c79f84ab diff --git a/core-jvm b/core-jvm index 8b3b049..b754cee 160000 --- a/core-jvm +++ b/core-jvm @@ -1 +1 @@ -Subproject commit 8b3b0498ac847dd33001b8eb94bcdd4123a2e726 +Subproject commit b754cee77c960bb260adcb61e3a710b6344219bc diff --git a/core-jvm-compiler b/core-jvm-compiler index 15b5c36..0367f7f 160000 --- a/core-jvm-compiler +++ b/core-jvm-compiler @@ -1 +1 @@ -Subproject commit 15b5c36b6277b36fa7e68fcd648efda66b3781e2 +Subproject commit 0367f7fa9c9054eb8ec180a7ed0fa1ac3cff766d diff --git a/delivery-server b/delivery-server index 33d6c3c..9f10606 160000 --- a/delivery-server +++ b/delivery-server @@ -1 +1 @@ -Subproject commit 33d6c3c065ff67ad1dd03fd6468e6fc0b5f15360 +Subproject commit 9f10606fb69161930797ad9c0608a01d3ede4b19 diff --git a/docs/dependency-graph.md b/docs/dependency-graph.md index 41808d8..aba456b 100644 --- a/docs/dependency-graph.md +++ b/docs/dependency-graph.md @@ -71,7 +71,7 @@ distributes to all of them identically. It is therefore a property of the shared build configuration rather than of any repository, and the edges below — derived from repository-owned build files — do not show it. -The direction that *is* shown, `dokka-tools --> base-libraries`, is a real +The direction that *is* shown, `dokka-tools -> base-libraries`, is a real declared dependency: the plugin uses `io.spine.annotation.Internal`. The reverse direction is a documentation-time dependency on a published version, so it constrains nothing about build order. @@ -172,30 +172,30 @@ nothing. The marker is one published artifact whose registry metadata answers "is version X of this repository published?"; the version property is the name of the literal in the repository's `version.gradle.kts`. -| Repository | Class | Registry : marker | Version property | -|---------------------|-------------|----------------------------------------------------|--------------------------| -| `base-libraries` | library | gcar : `io.spine:spine-base` | `versionToPublish` | -| `reflect` | library | gcar : `io.spine:spine-reflect` | `versionToPublish` | -| `logging` | library | gcar : `io.spine:spine-logging` | `versionToPublish` | -| `testlib` | library | gcar : `io.spine.tools:base-testlib` | `versionToPublish` | -| `dokka-tools` | library | gcar : `io.spine.tools:dokka-extensions` | `versionToPublish` | -| `tool-base` | library | gcar : `io.spine.tools:jvm-tools` | `versionToPublish` | -| `ProtoTap` | library | gcar : `io.spine.tools:prototap-gradle-plugin` | `versionToPublish` | -| `compiler` | library | gcar : `io.spine.tools:compiler-jvm` | `compilerVersion` | -| `validation` | library | gcar : `io.spine.tools:validation-java` | `validationVersion` | -| `core-jvm-compiler` | library | gcar : `io.spine.tools:core-jvm-gradle-plugin` | `coreJvmCompilerVersion` | -| `base-types` | library | gcar : `io.spine:spine-base-types` | `versionToPublish` | -| `change` | library | gcar : `io.spine:spine-change` | `versionToPublish` | -| `time` | library | gcar : `io.spine:spine-time` | `versionToPublish` | -| `money` | library | gcar : `io.spine:spine-money` | `versionToPublish` | -| `core-jvm` | library | gcar : `io.spine:spine-core` | `versionToPublish` | -| `jdbc-storage` | library | gcar : `io.spine:spine-rdbms` | `versionToPublish` | -| `gcloud-jvm` | library | gcar : `io.spine.gcloud:spine-datastore` | `versionToPublish` | -| `delivery-server` | library | github : `io.spine.delivery:spine-delivery-server` | `versionToPublish` | -| `BuildSpeed` | verify-only | — | — | +| Repository | Class | Registry : marker | Version property | +|---|---|---|---| +| `base-libraries` | library | gcar : `io.spine:spine-base` | `versionToPublish` | +| `reflect` | library | gcar : `io.spine:spine-reflect` | `versionToPublish` | +| `logging` | library | gcar : `io.spine:spine-logging` | `versionToPublish` | +| `testlib` | library | gcar : `io.spine.tools:base-testlib` | `versionToPublish` | +| `dokka-tools` | library | gcar : `io.spine.tools:dokka-extensions` | `versionToPublish` | +| `tool-base` | library | gcar : `io.spine.tools:jvm-tools` | `versionToPublish` | +| `ProtoTap` | library | gcar : `io.spine.tools:prototap-gradle-plugin` | `versionToPublish` | +| `compiler` | library | gcar : `io.spine.tools:compiler-jvm` | `compilerVersion` | +| `validation` | library | gcar : `io.spine.tools:validation-java` | `validationVersion` | +| `core-jvm-compiler` | library | gcar : `io.spine.tools:core-jvm-gradle-plugin` | `coreJvmCompilerVersion` | +| `base-types` | library | gcar : `io.spine:spine-base-types` | `versionToPublish` | +| `change` | library | gcar : `io.spine:spine-change` | `versionToPublish` | +| `time` | library | gcar : `io.spine:spine-time` | `versionToPublish` | +| `money` | library | gcar : `io.spine:spine-money` | `versionToPublish` | +| `core-jvm` | library | gcar : `io.spine:spine-core` | `versionToPublish` | +| `jdbc-storage` | library | gcar : `io.spine:spine-rdbms` | `versionToPublish` | +| `gcloud-jvm` | library | gcar : `io.spine.gcloud:spine-datastore` | `versionToPublish` | +| `delivery-server` | library | github : `io.spine.delivery:spine-delivery-server` | `versionToPublish` | +| `BuildSpeed` | verify-only | — | — | -`documentation` is not on the graph: it is a Spine 1.x site project, not part -of the SDK build line. +`documentation` is not on the graph: it is the documentation area of the +spine.io site, not part of the SDK build line. ## Maintenance diff --git a/docs/rollout/rebuild.md b/docs/rollout/rebuild.md index 55425e8..186653d 100644 --- a/docs/rollout/rebuild.md +++ b/docs/rollout/rebuild.md @@ -53,13 +53,27 @@ Wave kinds: fresh derivation (drift → fix the graph first), validates the registry probe markers, refuses to run over open `cascade-*` PRs, and writes the wave manifest pair to `.agents/tasks/.{json,md}`. **Review the printed order before -continuing.** Stragglers (`reflect`, `money`, `testlib`) are excluded by default; -opt them in with `--include` — their first `config/pull` is a migration, so -expect adapt work or parks. +continuing.** `plan` prints every repository it leaves out, with the reason; +`--include ` opts a default-excluded repository back in. The former +stragglers (`reflect`, `testlib`, `money`) were caught up one at a time in +October 2026 and are no longer excluded. -`retarget` prerequisite: the stragglers must be caught up first (every module -carries the target version). Verify the version guards accept the jump — Maven -qualifier ordering may rank `M1` below the `SNAPSHOT` line. +To run a wave for a single repository, scope the wave to it with one +`--exclude ` for each other repository (the option takes a single +repository and is repeated) and give it its own name with `--slug-suffix `. +`refresh` waves planned against the same `config` commit otherwise share a name, +and `plan` refuses a name whose wave is already archived: + +```bash +./cascade plan --kind refresh \ + --exclude base-libraries --exclude reflect --exclude logging ... \ + --slug-suffix testlib # -> cascade-refresh--testlib +``` + +`retarget` prerequisite: every repository must be caught up to the current +baseline first, so that every module carries the target version. Verify the +version guards accept the jump — Maven qualifier ordering may rank `M1` below +the `SNAPSHOT` line. ## 2. Drive the wave diff --git a/dokka-tools b/dokka-tools index 057439b..8fbb108 160000 --- a/dokka-tools +++ b/dokka-tools @@ -1 +1 @@ -Subproject commit 057439b62ea026a77f1ee3b39b8058642c656b05 +Subproject commit 8fbb108734a5df535475cdabde6cfd16376e7fb3 diff --git a/gcloud-jvm b/gcloud-jvm index 3090e2a..10926b6 160000 --- a/gcloud-jvm +++ b/gcloud-jvm @@ -1 +1 @@ -Subproject commit 3090e2a2d81cc50bd92c2f3c1f8601716c6eefd8 +Subproject commit 10926b6c2fd954fcc6e1d2e512ba6f2cbad15b0c diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..9fa7f28 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2e7bb9f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..249efbb --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# gradlew start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh gradlew +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..3185a43 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,112 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. + +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. + +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel + +@rem This label must not be changed. We rely on old scripts being able to jump to this point. +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/init-submodules b/init-submodules index 2ae143d..95b916b 100755 --- a/init-submodules +++ b/init-submodules @@ -49,7 +49,85 @@ set -u -root=$(git rev-parse --show-toplevel 2>/dev/null) || exit 0 +# Ignore an inherited `CDPATH`: it would redirect a relative `cd`, such as into +# the `.git` that `git rev-parse --git-common-dir` prints in a main checkout, +# and make `cd` print the directory it enters. +unset CDPATH + +# Decode the JSON string escapes that a path can hold: `\\` (each backslash of a +# Windows path), `\"`, and `\/`. Fail on any other escape, such as `\n`. +json_unescape() { + local rest=$1 out="" next + while :; do + case $rest in + *\\*) ;; + *) printf '%s' "$out$rest"; return 0 ;; + esac + out=$out${rest%%\\*} + rest=${rest#*\\} + next=${rest%"${rest#?}"} + case $next in + \\ | \" | /) out=$out$next ;; + *) return 1 ;; + esac + rest=${rest#?} + done +} + +# Act on the work tree the session is in. Claude Code runs this script as a +# `SessionStart` hook and passes the hook input JSON on stdin. The `cwd` field +# of that JSON is the session's working directory. In a worktree session, that +# directory is inside the worktree, while this process and `$CLAUDE_PROJECT_DIR` +# stay in the main checkout. Read stdin only when Claude Code started the script +# (it exports `CLAUDE_PROJECT_DIR` to hooks) and stdin is not a terminal, so that +# a manual run never waits for input. +# +# Parse the input with `jq` when it is installed. The bootstrap cannot require +# `jq`, so without it a pattern match reads the first `cwd` member, and +# `json_unescape` decodes it; a value it cannot decode falls back as described +# below. Unlike `jq`, the pattern does not validate the rest of the input, which +# Claude Code writes. Either way, the path must belong to the project, as checked +# below. +session_dir="" +if [ -n "${CLAUDE_PROJECT_DIR:-}" ] && [ ! -t 0 ]; then + if command -v jq >/dev/null 2>&1; then + session_dir=$(jq -r '.cwd // empty' 2>/dev/null) || session_dir="" + else + input=$(cat) + cwd_pattern='"cwd"[[:space:]]*:[[:space:]]*"(([^"\\]|\\.)*)"' + if [[ $input =~ $cwd_pattern ]]; then + session_dir=$(json_unescape "${BASH_REMATCH[1]}") || session_dir="" + fi + fi +fi + +# The physical path of the Git directory that a repository's main checkout and +# linked worktrees share; empty outside a work tree. Each `git` result is checked +# before use, because `cd ""` succeeds. +common_git_dir() { + (cd "$1" && top=$(git rev-parse --show-toplevel) && cd "$top" \ + && common=$(git rev-parse --git-common-dir) && cd "$common" && pwd -P) 2>/dev/null +} + +# From the session directory, climb out of any submodule (`config`, +# `.agents/shared`) to the first work tree of the project's own repository — its +# main checkout or a linked worktree. Anything else (no `cwd`, one that does not +# resolve, an unrelated repository) falls back to the current directory, as +# before: this script changes repository configuration, so it must not act on a +# repository the project does not own. +root="" +if [ -n "$session_dir" ]; then + project=$(common_git_dir "$CLAUDE_PROJECT_DIR") + tree=$(git -C "$session_dir" rev-parse --show-toplevel 2>/dev/null) + while [ -n "$tree" ] && [ -n "$project" ]; do + if [ "$(common_git_dir "$tree")" = "$project" ]; then + root=$tree + break + fi + tree=$(git -C "$tree" rev-parse --show-superproject-working-tree 2>/dev/null) + done +fi +[ -n "$root" ] || root=$(git rev-parse --show-toplevel 2>/dev/null) || exit 0 cd "$root" || exit 0 # Nothing to do in a repo without submodules. diff --git a/jdbc-storage b/jdbc-storage index c747908..572224a 160000 --- a/jdbc-storage +++ b/jdbc-storage @@ -1 +1 @@ -Subproject commit c747908403764eb9025826c0009d3928edd5882e +Subproject commit 572224ac7c4a0f68c041cfe962554961a0a5e899 diff --git a/money b/money index 13e2f83..801fd23 160000 --- a/money +++ b/money @@ -1 +1 @@ -Subproject commit 13e2f83aed3c2686fbb95e5f4f8dfb7eb2a9c41c +Subproject commit 801fd233b206ade2291d35fb7d8aa852fd10108a diff --git a/reflect b/reflect index 980720d..db12351 160000 --- a/reflect +++ b/reflect @@ -1 +1 @@ -Subproject commit 980720d676e5bca7e85905267627b657e5b5ae01 +Subproject commit db123516070cd2924a0d07a29944877e1d1d2ac5 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..eb0a8c4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "summit" diff --git a/testlib b/testlib index 1abead1..4ecdc90 160000 --- a/testlib +++ b/testlib @@ -1 +1 @@ -Subproject commit 1abead10d847fef5d32cdc5787e3aa5e53c4ed7f +Subproject commit 4ecdc909738b9ce39fd3bf1a981e94f226e9718d diff --git a/tool-base b/tool-base index fb816d3..6d4dc19 160000 --- a/tool-base +++ b/tool-base @@ -1 +1 @@ -Subproject commit fb816d35829cabc0b15a422bca92f8e71003d061 +Subproject commit 6d4dc19b6d2384c509f2ab69374c9c03b88a3834