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

17676 Commits

Author SHA1 Message Date
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
eugene yokota 69f8ad63d3
Merge pull request #8408 from anatoliykmetyuk/fix/issue-8340-serviceloader-fork 
Fix #8340: Add regression test
 2025-12-09 22:28:02 -05:00
eugene yokota 45d9cfffe2
Merge pull request #8409 from anatoliykmetyuk/rc-version-bump 
Bump RC to RC8-bin-SNAPSHOT
 2025-12-09 22:27:08 -05:00
Anatolii Kmetiuk e78d54af50 Bump RC to RC8-bin-SNAPSHOT 2025-12-10 11:37:25 +09:00
Anatolii Kmetiuk 1a3c6b5007 Fix #8340: Add regression test 2025-12-10 11:34:25 +09:00
eugene yokota 9d62f5e940
Merge pull request #8407 from xuwei-k/scala-2-12-21 
[1.x] Scala 2.12.21
 2025-12-09 04:51:32 -05:00
xuwei-k 70960744e7 Scala 2.12.21 2025-12-09 17:28:03 +09:00
eugene yokota c2d0188968
Merge pull request #8406 from eed3si9n/wip/bump-launcher 
[1.x] Update to launcher 1.5.2
 2025-12-09 00:12:59 -05:00
Eugene Yokota e8e44aab10 launcher 1.5.2 2025-12-08 23:51:39 -05:00
eugene yokota 507d221048
Merge pull request #8402 from anatoliykmetyuk/fix/forked-test-resources-access 
Fix #8345: forked test execution doesn't access main resources
 2025-12-08 23:14:35 -05:00
eugene yokota 6cb1751583
Merge pull request #8404 from azdrojowa123/build-target-sources 
Return build targets sources from `buildTarget/dependencySources` request
 2025-12-08 23:13:32 -05:00
Aleksandra Zdrojowa 0d9f40811b return build targets sources from `buildTarget/dependencySources` request #8403 2025-12-08 19:22:35 +01:00
Anatolii Kmetiuk 4bcf866193 Add regression test for #8345 2025-12-08 14:35:31 +09:00
Anatolii Kmetiuk 862884b330 Fix #8345: forked test execution doesn't access main resources 
Fixes issue where tests running in forked mode (Test / fork := true)
cannot access resources from src/main/resources, while non-forked
execution works correctly.

Root cause: Context classloader not set: tests using
Thread.currentThread().getContextClassLoader() couldn't find
resources because the context classloader wasn't set to the
URLClassLoader with the classpath

Solution: Set context classloader in ForkTestMain.runTests() to the
URLClassLoader containing the test classpath
 2025-12-08 14:17:09 +09:00
eugene yokota 33019a6453
Merge pull request #8401 from xuwei-k/Xfatal-warnings-Werror 
Use `-Werror` instead of `-Xfatal-warnings`
 2025-12-06 14:32:45 -05:00
xuwei-k 2b9211e5b4 use -Werror instead of -Xfatal-warnings 2025-12-05 16:22:07 +09:00
eugene yokota 87765c7035
Merge pull request #8399 from azdrojowa123/popOnFailure-order 
change the order of FailureWall & PopOnFailure in the reload command
 2025-12-04 21:10:12 -05:00
Aleksandra Zdrojowa 1f269ad604 change the order of FailureWall & PopOnFailure in the reload command #8389 
- it's done to prevent the sbt process from being killed in case of task failure after a load failure has been executed
 2025-12-04 16:12:11 +01:00
eugene yokota d4ad01e7ba
Merge pull request #8395 from mkurz/upgrade_scala 
[1.12.x] Scala 2.13.18
 2025-12-01 12:13:08 -05:00
Matthias Kurz 724027f8ad
Scala 2.13.18 2025-12-01 14:50:38 +01:00
eugene yokota ba8acdd27c
Merge pull request #8394 from eed3si9n/wip/repro-resource 
[2.x] fix: Fixes managed resources missing from the JAR
 2025-11-29 01:38:31 -05:00
Eugene Yokota ffc2f8c35d fix: Fixes managed resources missing from the JAR 
**Problem**
RC-7 is missing the managed resources.

**Solution**
This triggers managed resources so they get generated.
 2025-11-28 23:51:08 -05:00
eugene yokota 1fbe516465
Merge pull request #8390 from xuwei-k/mima-RC7 
Update mima setting
 2025-11-26 21:25:04 -05:00