luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,548 Commits 29 Branches 318 Tags 95 MiB
Commit Graph

17548 Commits

Author SHA1 Message Date
Francluob 4976ec7dc7 Fix #8344: Skip interactive prompt in batch mode when project loading fails 
When project loading fails in batch mode, sbt was showing an interactive
prompt asking the user to choose between retry, quit, last, or ignore.
However, in batch mode there is no interactive terminal, causing the
process to hang waiting for input that will never come.

This fix checks if we're in batch mode (Prompt.Batch) and automatically
exits with failure (equivalent to 'q' quit option) without prompting the
user. This prevents infinite retry loops on persistent errors and allows
batch mode scripts to fail fast, which is appropriate for CI/CD environments.

The interactive behavior remains unchanged for non-batch mode.
 2026-01-08 19:29:35 +01:00
aka James4u a4ad73ddf6
fix: prevent server boot when --no-server is used (#8444) 
* fix: prevent server boot when --no-server is used
* refactor: move serverAutoStart to sysprops
* refact: scalafmt
 2026-01-07 15:11:04 -05:00
eugene yokota 948f12cf54
Merge pull request #8440 from MkDev11/fix/windows-debug-options-8100 
[2.x] Fix debug options breaking launcher on Windows
 2026-01-06 15:48:07 -05:00
mkdev11 79ab58f4af Add regression test for debug options in SBT_OPTS (#8100) 2026-01-06 14:21:03 +02:00
mkdev11 17f03201d3 Fix debug options breaking launcher on Windows 
Filter rt-ext-dir output for java9-rt-ext- pattern, matching the
Unix script behavior. This prevents debug agent stdout (e.g.,
'Listening for transport dt_socket at address: 1234') from being
incorrectly parsed as a file path.

Fixes #8100
 2026-01-06 11:00:25 +02:00
eugene yokota 7e59872d31
Merge pull request #8437 from eed3si9n/wip/bump-zinc 
[2.x] Zinc 2.0.0-M11
 2026-01-05 01:20:37 -05:00
Eugene Yokota f49b6747c7 [2.x] Zinc 2.0.0-M11 2026-01-05 01:01:37 -05:00
eugene yokota 4a39f0c41b
Merge pull request #8436 from eed3si9n/wip/merge-1.12.x 
[2.x] Merge 1.12.x
 2026-01-05 00:34:15 -05:00
Eugene Yokota e3f99d39cb Merge branch '1.12.x' into wip/merge-1.12.x 2026-01-05 00:08:21 -05:00
Eugene Yokota fcb4e0e43c sbt 1.12.0 2026-01-04 21:18:03 -05:00
eugene yokota 6f50a1efca
Merge pull request #8434 from eed3si9n/wip/bump 
[1.x] Zinc 1.12.0
 2026-01-04 21:04:04 -05:00
Eugene Yokota 0e546f0b35 [1.x] Zinc 1.12.0 2026-01-04 20:50:33 -05:00
eugene yokota 2e8e03eb0e
Merge pull request #8432 from eed3si9n/bport/scala-version 
[1.x] Show warnings when scalaVersion is missing
 2026-01-04 15:34:43 -05:00
eugene yokota 457127a090
Merge pull request #8431 from eed3si9n/wip/fork-test 
[2.x] fix: Use TCP for forked test
 2026-01-04 15:24:09 -05:00
Eugene Yokota 0a15069e83 Show warnings when scalaVersion is missing 
**Problem**
There's a disconnect between what is perceived to be the current
Scala version, and what sbt uses internally, and thus what it
chooses to be the default scalaVersion.

**Solution**
This displays a warning if scalaVersion setting is missing.
 2026-01-04 15:23:05 -05:00
Eugene Yokota c20d83a8e2 Use TCP for the fork test 
**Problem**
Forked test currently uses stdio, but that println to be lost.

**Solution**
Use TCP for communication similar to sbt 1.x.
 2026-01-04 01:48:45 -05:00
eugene yokota 2b404d6a60
Merge pull request #8428 from eed3si9n/wip/scala-version 
[2.x] Show warnings when scalaVersion is missing
 2025-12-28 00:07:16 -05:00
Eugene Yokota 6cb786d010 [2.x] Show warnings when scalaVersion is missing 
**Problem**
There's a disconnect between what is perceived to be the current
Scala version, and what sbt uses internally, and thus what it
chooses to be the default scalaVersion.

**Solution**
This displays a warning if scalaVersion setting is missing.
 2025-12-27 23:49:43 -05:00
Eugene Yokota 55aa1b52ff Disable task-cancel test 2025-12-27 02:37:32 -05:00
eugene yokota 48f96dfbd5
Merge pull request #8427 from eed3si9n/wip/no-such 
[2.x] fix: Workaround for NoSuchFileException
 2025-12-25 04:57:48 -05:00
Eugene Yokota 7d76f8f33e [2.x] fix: Workaround for NoSuchFileException 
**Problem**
In some scripted tests, we've seen NoSuchFileException.

**Solution**
Catch the exceptions related to caching.
 2025-12-25 04:38:43 -05:00
eugene yokota 65605efc8b
Merge pull request #8426 from eed3si9n/wip/reprop-lm-bug 
[2.x] fix: Resolver.combineDefaultResolvers
 2025-12-25 04:05:42 -05:00
Eugene Yokota a9e38e3a1c [2.x] fix: Resolver.combineDefaultResolvers 
**Problem**
combineDefaultResolvers loses information.

**Solution**
This fixes it.
 2025-12-25 01:49:57 -05:00
Eugene Yokota 67e52c3006 sbt 1.12.0-RC1 2025-12-19 23:46:35 -05:00
eugene yokota 5b92e34dbd
Merge pull request #8422 from eed3si9n/wip/crosspath 
[2.x] fix: Replace Scala version with u when crossPaths is false
 2025-12-19 03:11:09 -05:00
eugene yokota b926c84c1d
Merge pull request #8425 from eed3si9n/wip/bump-lm 
[1.x] Update to lm 1.12.0-M2
 2025-12-19 02:45:19 -05:00
Eugene Yokota fb37b9c66b [1.x] Update to lm 1.12.0-M2 2025-12-19 02:02:16 -05:00
eugene yokota b536bc037d
Merge pull request #8359 from eed3si9n/wip/dependency-tree 
[1.x] Use internal config for dependency tree (for Provided)
 2025-12-19 01:08:44 -05:00
eugene yokota 2fad041c5f
Merge pull request #8424 from eed3si9n/wip/bump-zinc 
[1.x] Update to Zinc 1.12.0-M2
 2025-12-19 00:47:17 -05:00
Eugene Yokota 7bb5180f9e [1.x] Update to 1.12.0-M2 2025-12-19 00:23:07 -05:00
eugene yokota 7fb942ee5c
Merge pull request #8423 from Duhemm/help-arg-parsing 
[2.x] Fix `help` command arguments parsing
 2025-12-18 21:14:40 -05:00
Martin Duhem 37037357a3
Fix `help` command arguments parsing 
Previously, some additional code was used to parse the arguments to the
`help` command and ensure that the remaining commands were consistent
with the desired state of sbt.

While this code worked well in sbt 1.x, and was helpful in getting `sbt
help new` to work as expected, this does not work in sbt 2, and is
actually not required.

This patch removes the additional code, which fixes the `help` command
in sbt.
 2025-12-18 17:49:32 +01:00
Eugene Yokota e6492b771e [2.x] fix: Replace Scala version with u when crossPaths is false 
**Problem**
sbt 2.x uses crossTarget by default, but it contains Scala version
even when crossPaths is false.

**Solution**
This replaces it with the letter "u" for unspecified.
 2025-12-18 00:00:11 -05:00
eugene yokota 03d57c5803
Merge pull request #8413 from sideeffffect/1.11.x-JDK_JAVA_OPTIONS 
[1.x] Handle JDK_JAVA_OPTIONS
 2025-12-17 18:09:27 -05:00
eugene yokota 26b5ee457f
Merge pull request #8421 from eed3si9n/wip/matrix-cross 
[2.x] projectMatrix crossVerson support
 2025-12-16 23:45:43 -05:00
eugene yokota 07e33bc51e
Merge pull request #8420 from eed3si9n/wip/bump-zinc 
[2.x] fix: Scala 3.8 REPL support
 2025-12-16 23:45:27 -05:00
Eugene Yokota 4d6ddd50a6 [2.x] projectMatrix crossVerson support 
**Problem**
crossVersion is missing from projectMatrix in sbt 2.x.

**Solution**
Port it from sbt-projectmatrix.
 2025-12-16 01:33:43 -05:00
Eugene Yokota 3518ae497e [2.x] fix: Scala 3.8 REPL support 2025-12-15 23:48:36 -05:00
eugene yokota c187b6e1f5
Merge pull request #8419 from eed3si9n/wip/gson 
[2.x] Switch to using shaded-gson
 2025-12-15 04:38:03 -05:00
Eugene Yokota 9888aae7fa [2.x] Switch to using shaded-gson 
Fixes https://github.com/sbt/sbt/issues/8334
 2025-12-15 03:17:33 -05:00
eugene yokota 5245bf2b5e
Merge pull request #8417 from sbt/dependabot/github_actions/dessant/lock-threads-6 
Bump dessant/lock-threads from 5 to 6
 2025-12-15 02:09:42 -05:00
dependabot[bot] 88d15d375d
Bump dessant/lock-threads from 5 to 6 
Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 5 to 6.
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dessant/lock-threads/compare/v5...v6)

---
updated-dependencies:
- dependency-name: dessant/lock-threads
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-15 04:00:59 +00:00
eugene yokota d3bd93e2f2
Merge pull request #8415 from azdrojowa123/1.12.x-build-target-sources 
Return build targets sources from `buildTarget/dependencySources` request
 2025-12-14 15:43:13 -05:00
Aleksandra Zdrojowa 14f1839647 return build targets sources from `buildTarget/dependencySources` request #8403 2025-12-14 13:35:25 +01:00
Ondra Pelech 527989ee10 fix 2025-12-12 16:35:00 +01:00
Ondra Pelech d48895df85 Handle JDK_JAVA_OPTIONS 2025-12-12 15:44:25 +01:00
eugene yokota 4ef942e7e0
Merge pull request #8412 from anatoliykmetyuk/fix/issue-8405-updatesbtclassifiers-includes-plugins 
Fix #8405 updateSbtClassifiers plugins output
 2025-12-10 23:35:18 -05:00
Anatolii Kmetiuk eec0b4a6a0 Fix scripted dependency-management/update-sbt-classifiers test 2025-12-11 12:16:12 +09:00
Anatolii Kmetiuk b7cb338171 Add regression test for #8405 2025-12-11 11:44:27 +09:00
Anatolii Kmetiuk 0acb12a978 Fix #8405: updateSbtClassifiers includes plugins in dependencies list 
Preserve original direct dependencies (plugins) and merge with transitive dependencies
Original dependencies may include plugins that are NOT transitive dependencies of sbt
 2025-12-11 10:50:29 +09:00