Commit Graph
18359 Commits
Author SHA1 Message Date
eugene yokota c8a0007d6e [2.x] feat: Persistent worker for test (#9678) 2026-09-25 03:30:09 -04:00
eugene yokota f9ca5f5ee6 [2.x] fix: Fixes inMemoryAnalysisCache limit (#9500)
**Problem**
The in-memory Analysis cache is currently weighted by on-disk size,
but according to the user report it expands out 50x, so 100MB
size limit doesn't hit.

**Solution**
This set maxCount instead, default 20 and configurable by system property
sbt.local_cache.analysis_count.
2026-09-24 18:38:55 -04:00
eugene yokota 754d0d5e37 [2.x] fix: Remove duplicate self JAR from Runtime (#9820)
**Problem**
Since #9471, Runtime/fullClasspath combines exportedProducts
(unversioned) with the Runtime internal dependency classpath
(packageBin, versioned), so the project's own JAR appears twice.

**Solution**
In Runtime, build fullClasspath and fullClasspathAsJar from
the versioned exported products.
2026-09-24 18:38:14 -04:00
eugene yokota 2f667aee96 [2.x] Include other repos into devcontainer (#9819) 2026-09-24 17:03:16 -04:00
eugene yokota dd7b23b0d2 [2.x] Update user-agent to major.minor (#9818)
To avoid user-agent being used for tracking, use only major.minor.
2026-09-24 16:57:45 -04:00
Albert Meltzer c7e8ce5f55 [2.x] refactor: VirtualAxis: refactor constructing ScalaVersionAxis (#9789) 2026-09-22 18:52:45 -04:00
Albert MeltzerandClaude Fable 5.1 b9c722a95f [2.x] refactor: ProjectMatrix: re-use xxxPlatform methods (#9788)
* [2.x] ProjectMatrix: re-use xxxPlatform methods
* [2.x] ProjectMatrix: pass configure directly

---------

Co-authored-by: Claude Fable 5.1 <[email protected]>
2026-09-22 18:30:27 -04:00
Jozef Koval 27f1792e91 [2.x] fix: publishLocal must overwrite, remote publish must not (#9814)
Fixes #9813.

With overwrite = false, the default for non-snapshot versions, the ivyless
publisher kept an existing file and reported success, leaving stale bytes and
checksums. The HTTP paths took overwrite and never read it. sbt 1.x did the
opposite in both cases: file repositories warned and overwrote (22f47be29),
remote ones refused.

Restore that. File targets now warn and write through a temp file; HTTP targets
refuse after a HEAD probe that fails open. Also route a file: URLRepository,
Ivy or Maven layout, to the filesystem instead of httpPut.
2026-09-22 17:02:43 -04:00
PhoenixmitX 31f571314a [2.x] fix: restore the pipelining early output on an action-cache hit (#9793)
Problem
compileIncremental declares the analysis file and the classes directory
as cache outputs, but not the early (pickle) jar or the early analysis.
A cache hit therefore leaves a subproject with a restored analysis and
no early jar. On the next incremental round Zinc has no jar to merge
scalac's pickles into, so the early jar ends up holding only that
round's TASTy/sig files, afterEarlyOutput(true) fires, and every
downstream subproject is compiled against it and fails with "Not found"
for each upstream type that was not just recompiled.

Solution
- Declare the early jar and the early analysis file as outputs of
  compileIncremental when exportPipelining produced them, so a hit
  restores them.
- Restored outputs are symlinks into the CAS, and Zinc rewrites the
  early jar in place when it merges a round's pickles. Replace a
  symlinked early jar by a real copy before Zinc runs so the cached
  blob is never modified.
- When a previous analysis exists but the early jar does not (a cache
  written before the jar was an output, exportPipelining switched on
  for an existing build, a deleted early directory), recompile the
  subproject from scratch, which writes a complete jar.
2026-09-22 14:49:30 -04:00
Matthias Kurz 0c6ffced79 [2.x] fix: Derive Maven paths from module and artifact names (#9811)
**Problem**

The non-Ivy Maven publisher derived the repository directory and every
filename from the first POM artifact. Custom-named artifacts could collide
with and replace the main JAR, while legacy sbt 1 plugin publishing depended
on artifact map order and collapsed crossed and uncrossed files.

**Solution**

Derive the directory from module coordinates and each filename from the
platform-aware cross-versioned artifact name. Reject target-path collisions
before publishing, de-duplicate remote snapshot metadata, and cover ordinary,
platform, snapshot, and legacy plugin layouts with unit, property, and
scripted tests.

Generated-by: OpenAI Codex
2026-09-22 14:07:40 -04:00
Albert Meltzer 3cd72defa0 [2.x] refactor: CrossVersionExtra: extra cross-version parser (#9790) 2026-09-22 14:06:43 -04:00
eugene yokota 582d5024e1 [2.x] Update Contributor's guide (#9807) 2026-09-22 12:23:48 -04:00
Mai Huy Hoàng 52ac4e02ee [2.x] fix: hash the boot classpath in a deterministic order (#9809)
The launcher enumerates the boot directory, so `AppProvider.mainClasspath` and `ScalaProvider.jars` come back
in filesystem order, and sbt 2 folds that classpath into the metabuild's `CompileInputs2`. Two machines with
identical inputs therefore compute different keys: measured on one project at the same commit, same sbt and
same JDK, 439 classpath entries on both sides, the same set, 83 of them at a different index and all under
${SBT_BOOT}.

Sorting happens after conversion to the rooted virtual path, so the order is independent of the filesystem
and of where the boot directory lives. The order being replaced is a directory listing, not one anybody
chose. `Main.rawEval` builds the same list but never reaches a cache key, so it is left alone.

Generated-by: Claude Opus 5 (Claude Code)
2026-09-22 01:41:59 -04:00
Matthias Kurz 2124f13ac6 [2.x] fix: Restore sbt 1 plugin POM metadata (#9806)
**Problem**

sbt 1 plugin variants published by sbt 2 omitted the sbtVersion,
scalaVersion, and extraDependencyAttributes POM properties. Without this
metadata, sbt 1 consumers could resolve direct and transitive versions of
the same plugin as separate modules.

**Solution**

Restore module extra properties and Ivy-compatible dependency metadata in
generic POM generation. Preserve multiple dependency records through XML
formatting and cover publication and eviction with unit and scripted tests.

Fixes #9805

Generated-by: OpenAI Codex
2026-09-21 14:29:57 -04:00
Matthias Kurz 8c323c358b [2.x] fix: Restore cross-suffixed artifactIds in sbt 1 plugin POMs (#9804)
**Problem**

sbt 1 plugin variants published by sbt 2 used cross-suffixed Maven paths and files, but their generated POMs retained uncrossed module and plugin-dependency artifact IDs.

**Solution**

Restore the former Ivy cross-version transformation for the module and plugin dependencies before generic POM generation. Re-enable and modernize the scripted publication test.

Fixes #9803

Generated-by: OpenAI Codex
2026-09-21 13:27:40 -04:00
eugene yokota 466347159f [2.x] Update sbtn to 2.1.0-M2 (#9801) v2.1.0-M2 2026-09-21 04:21:33 -04:00
eugene yokota 5e5cebf7fd [2.x] Update Zinc to 2.1.0-M4 (#9802) 2026-09-21 04:20:20 -04:00
eugene yokota fad9988582 [2.x] Revert to Zinc 2.1.0-M2 (#9800) 2026-09-21 01:42:21 -04:00
Eugene Yokota e7018fe642 refactor: Avoid default parameter 2026-09-21 00:32:04 -04:00
Eugene Yokota 021f40d358 [2.x] Zinc 2.1.0-M3 Gigahorse 0.9.7 2026-09-21 00:27:15 -04:00
Stas Shevchenko 3c53033cf8 [2.x] Deploy remote Maven snapshots with one timestamp (#9756)
Every artifact went up under the plain -SNAPSHOT name with no maven-metadata.xml, so a repo with unique snapshot naming stamped each upload on its own. Remote Maven snapshot deploys now pick one timestamp and build number for the whole publication and send the metadata.
2026-09-21 00:10:49 -04:00
Mai Huy HoàngandClaude Opus 5 983e6a14c0 [2.x] fix: Make sbtn's result line consistent with sbt --server (#9783)
**Problem**
sbt compile through the thin client prints only elapsed time: 2 s, where the
same command in the shell or under sbt --server prints
elapsed time: 2 s, cache 94%, 13 disk cache hits, 24 remote cache hits. The
summary is computed server-side and thrown away: ManagedLogger.success is gated
on Terminal.isSuccessEnabled, and a NetworkChannel's terminal answered
interactive.get || isInWatch, which is false whenever a command is passed on
the command line. The line the user sees is the client's own, built from
wall-clock alone.

**Solution**
Report the line from the server, and have the client print only when the server
will not.

NetworkChannel's terminal reports isSuccessEnabled = true, so the server
writes the line on every channel, and it advertises successLog in its
capabilities. A server from before this sends no such key, which reads as false,
so an older client-server pair behaves as it does today; an unattached client
also always prints, since it renders build/logMessage rather than the proxied
systemOut bytes. Older sbtn keeps printing its own line and so reports
success twice until it updates.

Generated-by: Claude Opus 5

Claude-Session: https://claude.ai/code/session_015BqrfmHbJUph6Kx7gJn3G8

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
2026-09-21 00:06:51 -04:00
kenji yoshida 3fe78f4163 [2.x] deps: Update caffeine (#9796) 2026-09-20 04:43:12 -04:00
kenji yoshida 3dc5e621f6 [2.x] deps: Remove disruptor dependency (#9797) 2026-09-20 04:42:25 -04:00
eugene yokota e17be8456a [2.x] deps: Launcher 1.7.0 (#9798)
This uses multi-release jar to woarkaround sun.misc.Unsafe.
2026-09-20 04:11:55 -04:00
kenji yoshida a50bf5cf5c [2.x] test: Fix transient key warnings in scripted tests (#9795) 2026-09-19 22:33:25 -04:00
eugene yokota 2ef94e086c [2.x] Custom user agent (#9786)
**Problem**
We want to track the network request created by sbt.

**Solution**
This sets both sbt version and Coursier version into the user agent.
2026-09-17 23:10:52 -04:00
Albert MeltzerandClaude Opus 5 e4e7ec8116 [2.x] fix: Read the token again when it is refused (#9738)
**Problem**
The client sent the handshake and ignored the answer: responsePlan had
no case for it, so an invalid token was dropped. The channel then stayed
unauthenticated and every later request was refused, with nothing saying
why.

**Solution**
Match the handshake response. On a refusal, read the token file again
and present what it names now, up to handshakeAttemptLimit times, then
report the refusal.

---------

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
2026-09-17 22:44:10 -04:00
eugene yokota e95712b79f [2.x] deps: Coursier 2.1.25 (#9784) 2026-09-17 19:20:43 -04:00
Albert Meltzer 5d2153cf96 [2.x] ci: Use sbt scalafmtRepo (#9785) 2026-09-17 19:06:13 -04:00
kenji yoshida 0b5075fc4b [2.x] Remove dataclass-annotation dependency (#9776) 2026-09-16 12:55:46 -04:00
kenji yoshida ef2b58a358 [2.x] deps: Update scala-xml and scala-parser-combinators (#9777) 2026-09-16 12:54:11 -04:00
Albert MeltzerandClaude Opus 5 37b3cc59b1 [2.x] ProjectMatrix: validate axes against autoScalaLibrary (#9771)
The flag and the axes both say whether a row is built for Scala, and
where they disagree the flag wins: a row given versions and
autoScalaLibrary = false is built for none of them, and the versions
are dropped. Nothing said so.

ProjectMatrix: validate axes against autoScalaLibrary

---------

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
2026-09-16 12:52:48 -04:00
Anatolii Kmetiuk a20dfa9495 [2.x] fix: Name taskValue in its compile-time diagnostic (#9779)
Problem: taskValue outside a task or setting macro reports an error naming value.

Solution: use a dedicated taskValue marker, preserve macro processing, and add diagnostic and behavioral regression tests.
2026-09-16 12:48:11 -04:00
eugene yokota 31779bf38d [2.x] fix: Update to Gigahorse 0.9.6 for preauth (#9775)
**Problem**
With HTTP/2, Apache HttpClient can begin the authenticated replay while the rejected stream is still consuming the same repeatable file producer.
The overlapping consumption can send corrupted artifacts, according to mkurz.

**Solution**
This hopefully fixes the issue by updateing to Gigahorse 0.9.6, which fixes the preauth support.
2026-09-16 12:16:10 -04:00
Albert MeltzerandClaude Opus 5 7563b7790b [2.x] Allow adding rows and configuring them separately, and through any method (#9765)
* [2.x] test: Pin what a platform axis alone does

**Problem**
`jsPlatform` enables the Scala.js plugin; the axis does not. A row
built by `customRow` with `VirtualAxis.js` is a Scala.js row by every
name it carries and a JVM row by what runs.

**Solution**
Assert what such a row reports as its platform.

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>

* [2.x] feat: Enable JS/Native plugins if the axis is used

Only jsPlatform and nativePlatform enabled the plugin their platform
needs, so using customRow directly would skip it.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>

* [2.x] feat: Configure the rows a matrix builds

A build could reach every row with configure, or one row with the call
that made it, and nothing in between, so settings for the rows of one
platform travelled with every call that creates them. Now
configureRows takes a function of a row's axes and answers with what
to apply, and a row is given it as it is built, so a row declared
after the call is covered too.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>

---------

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
2026-09-16 21:53:11 +09:00
Anatolii Kmetiuk 152c66a34c [2.x] fix: Warn on output declarations in uncached tasks (#9770) 2026-09-15 23:30:59 -04:00
Albert Meltzer 3460089ec7 [2.x] fix: Do not duplicate platform axes on a row (#9757)
* test: Pin the axes of a row that carries no Scala version

`jvmPlatform(autoScalaLibrary = false)` passes `VirtualAxis.jvm` to
`customRow`, which appends it again, so the row holds the platform axis
twice and its generated directories are named `scalajvm-jvm` and
`javajvm-jvm`. Nothing covered that path.

* fix: Keep one platform axis on a row that names its own

`jvmPlatform(autoScalaLibrary = false)` hands `customRow` the platform
axis, and `customRow` appended a second one, so the row's generated
directories were named `scalajvm-jvm` and `javajvm-jvm` and a cell
whose sources sat in the usual places compiled nothing. Now the axis is
appended only when the caller named no platform.
2026-09-15 14:10:22 +09:00
kenji yoshida 70e0a550a7 Update ModuleIDExtra.exclude deprecated annotation (#9758) 2026-09-15 10:21:21 +09:00
kenji yoshida 21fe27f62c [2.x] ci: Fix warnings (#9768) 2026-09-14 19:28:07 -04:00
kenji yoshida 0fc907cf85 [2.x] ci: Update mima setting (#9760) 2026-09-14 17:21:38 -04:00
eugene yokota e0666adb7b [2.x] Use sbt 2.1.0-M1 (#9767) 2026-09-14 17:20:36 -04:00
Stas Shevchenko c623288a9a [2.x] fix: Fixes Windows runner handling of sbt bsp (#9766)
* fix: forward bsp argument to sbt on Windows
* test: exercise sbt script bsp command directly
2026-09-14 14:34:04 -04:00
eugene yokota 14148450e2 [2.x] Update sbtn to 2.1.0-M1 (#9755) v2.1.0-M1 2026-09-13 03:25:25 -04:00
eugene yokota 801280dc61 [2.x] fix: clean task (#9752)
**Problem**
The clean task no longer works as intended on sbt 2.x due to the disk cache.

**Solution**
This implements an in-memory state of invalidation for subproject and
configuration axes. So clean task would mark subprojects to be
invalidated regardless of the disk cache state.
The invalidation state would be lifted once any cached task executes,
so it's not technically same as sbt 1.x, but the UX should be similar.
2026-09-12 23:18:11 -04:00
Stas Shevchenko 4eba898c9e [2.x] fix: let one client at a time restart the server (#9708)
Two invocations that both find different -D options could interleave, the second
one connecting to the server the first had just started and shutting that down
mid-build. The restart now holds the connection file and reads it again once it
has it, so a replacement that already carries the right options is left alone.
2026-09-12 18:56:21 -04:00
eugene yokota 7d1878bd1f [2.x] fix: Fixes test setup/cleanup interleaving (#9727)
**Problem**
Tags are enforced per task node.
This means that a chain like setup-test-cleanup
would release the tags midway, and allow interleaving
executions even for exclusive tests.

**Solution**
This implements a special Span tag, which lets us
keep the tags across the task chains.
Since this requires the flatMapped tasks to not carry their
own tags to prevent a deadlock, the feature needs to be opt-in /
internal implementation.
2026-09-12 17:42:54 -04:00
Alexander 81cb1cdd19 [2.x] fix: Fix sbt runner script not starting on openSUSE (#9753)
**Problem**
sbt fails to start on openSUSE, since OSTYPE=linux, not linux-gnu.
The startup script tries to add .ZIP extension, and fails to untar native client.

**Solution**
Modified startup script only check that OSTYPE starts with linux, instead of linux-gnu.
2026-09-12 15:09:58 -04:00
Stas Shevchenko ea673bf06f [2.x] fix: include compileOrder and pipelining in compile cache key (#9749)
compileOrder and usePipelining were missing from CompileInputs2, so two builds differing only in those settings shared one cache entry and replayed each other's results. Adds both to the key, with a unit test on the hash and a scripted test that fails without the change.
2026-09-12 02:20:06 -04:00
Albert Meltzer 9532b51190 ci: Upgrade MiMa to 1.2.0 (#9750)
* build: Upgrade MiMa to 1.2.0
* build: Filter every sbt.internal problem at once
2026-09-11 19:28:12 -04:00