Commit Graph

11526 Commits

Author SHA1 Message Date
Brice Jaglin fb479efdf9 includePluginResolvers should work for coursier resolutions 2022-03-23 12:25:35 +01:00
eugene yokota 2338bea9db
Merge pull request #6839 from sbt/1.7.x
Porting 1.7.x to develop
2022-03-18 12:17:26 -04:00
Adrien Piquerez f0552e4bc3
Merge pull request #6830 from kpodsiad/feat/scala-test-classes-framework
feat: add optional framework field to the bsp
2022-03-16 08:56:10 +01:00
Kamil Podsiadlo ce978a19ed tests: add test case for framework field in scala test classes request 2022-03-10 19:56:49 +01:00
eugene yokota fedf6af60d
Merge pull request #6833 from sbt/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-03-08 18:54:22 -07:00
Adrien Piquerez 1396e1605d Try fix CI: Build and test (6) 2022-03-08 18:19:20 +01:00
dependabot[bot] 144398ec73
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 04:03:17 +00:00
Kamil Podsiadlo 23b50688ba feat: add optional framework field to the bsp 2022-03-04 10:53:25 +01:00
eugene yokota ba5f7527fe
Merge pull request #6824 from gontard/remote_cache_not_found_log
Improve log for not found remote cache artifact
2022-02-26 20:43:00 -05:00
gontard d25dfd06ab Improve log for not found remote cache artifact
Before
remote cache not found for 0.0.0-7c40144bd1c774e6

After
remote cache artifact not found for org.gontard:sbt-test:0.0.0-7c40144bd1c774e6 Some(cached-compile)
2022-02-25 16:14:53 +01:00
eugene yokota 18882088cd
Merge pull request #6820 from tsawada/friendly-curl
launcher: debian package to depend on curl | wget
2022-02-21 23:39:41 -05:00
Takeo Sawada a0e5b553ef launcher: debian package to depend on curl | wget
also give informative error message when neither is available
2022-02-21 17:38:18 +09:00
eugene yokota c7f2c046b6
Merge pull request #6816 from Nirvikalpa108/fix-6802
Fixes parsing command args that include quotes but don't start with them
2022-02-04 14:42:22 -05:00
Amina Adewusi ca8fd354bd Fixes parsing command args quote problem
Fixes #6802.
2022-02-04 17:52:39 +00:00
Eugene Yokota ed022a70ac sbt 1.6.2 2022-01-31 23:25:20 -05:00
eugene yokota 567fd8b60b
Merge pull request #6808 from eed3si9n/wip/lm
[1.6.x] Make License object available
2022-01-31 22:47:04 -05:00
eugene yokota 611b8cf01b
Merge pull request #6807 from eed3si9n/bport/6803
[1.6.x] fix: propagate `InterruptedException` from JLine.readLine
2022-01-31 22:11:10 -05:00
Eugene Yokota 761ad14267 Make License object available
Fixes #1937
Ref https://github.com/sbt/librarymanagement/pull/395
2022-01-31 22:00:54 -05:00
tpetillot 4f9fe2af64 fix: propagate `InterruptedException` from JLine.readLine
Motivation:
Cannot exit from InteractionService.readLine

Modification:
Remove try/catch of InterruptedException mapped to None in JLine.readLine
2022-01-31 21:40:32 -05:00
eugene yokota 50c3cf1082
Merge pull request #6803 from tpetillot/issue-6784-propagate-interrupted-exception-read-line
fix: propagate `InterruptedException` from JLine.readLine
2022-01-31 21:39:09 -05:00
eugene yokota ca0fd3db8c
Merge pull request #6806 from eed3si9n/wip/test_framework
[1.6.x] Throw when test framework cannot be loaded due to MatchError or NoClassDefFoundError
2022-01-31 17:13:51 -05:00
Eugene Yokota a549e79c1d Throw when test framework cannot be loaded due to MatchError or NoClassDefFoundError
Problem
-------
In some situations like Dotty Community Build, sbt version is
mechanically upgraded on an old commit without humans checking the log.
For reasons we're not completely sure (likely change in ClassLoader
structure) sbt 1.6.x started to fail to load test frameworks during
tests, but since the failure of the test framework loading doesn't fail
the task, this silently succeeded the builds.

Solution
--------
On MatchError and NoClassDefFound Error, rethrow the exception.
Note that ClassNotFoundException is considered ok since we have
predefined test frameworks listed in sbt, which often are not included
in the users' classpath.
2022-01-31 16:37:38 -05:00
Eugene Yokota f5fb537c6d sbt 1.6.1 2022-01-31 16:23:00 -05:00
tpetillot 21e5f2dead fix: propagate `InterruptedException` from JLine.readLine
Motivation:
Cannot exit from InteractionService.readLine

Modification:
Remove try/catch of InterruptedException mapped to None in JLine.readLine
2022-01-26 16:24:23 +01:00
eugene yokota 0518ede298
Merge pull request #6799 from Nirvikalpa108/remove-unimplemented-scalacoption
Remove scalacoption -S-X
2022-01-21 10:28:23 -05:00
Amina Adewusi a3610377d4 Remove scalacoption -S-X
Fixes https://github.com/sbt/sbt/issues/6785.
2022-01-21 14:51:11 +00:00
eugene yokota 952546f413
Merge pull request #6794 from eed3si9n/wip/fix
Fix test
2022-01-18 00:51:04 -05:00
Eugene Yokota fb64858053 Fix test 2022-01-17 23:44:38 -05:00
eugene yokota a53eb471b3
Merge pull request #6790 from xuwei-k/CI-status-badge
Update CI status badge in README
2022-01-16 23:42:03 -05:00
kenji yoshida 89991eda69
Update CI status badge in README 2022-01-17 13:27:21 +09:00
eugene yokota a523fa8662
Merge pull request #6766 from eed3si9n/wip/lazyval
Use lazy val
2021-12-28 23:46:25 -05:00
Eugene Yokota 515993498d Use lazy val 2021-12-28 23:45:04 -05:00
eugene yokota 06a09b03dd
Merge pull request #6765 from eed3si9n/wip/log4j
[1.6.x] log4j 2.17.1
2021-12-28 23:40:39 -05:00
Eugene Yokota d71a1fbdac log4j 2.17.1
Fixes CVE-2021-44832
https://logging.apache.org/log4j/2.x/security.html
2021-12-28 23:07:39 -05:00
Eugene Yokota 43088834d2 sbt 1.6.0 2021-12-26 13:44:22 -05:00
eugene yokota d4e8d0e4de
Merge pull request #6762 from eed3si9n/wip/bump
[1.6.0] Zinc 1.6.0
2021-12-26 02:17:39 -05:00
Eugene Yokota 544a935534 Update banner 2021-12-26 01:48:14 -05:00
gontard 990fa9530f Ensure sbtConfig argv does not need sbt in PATH
Before, the BSP config .bsp/sbt.json generated by `sbt bspConfig`
contained a command line which required the sbt binary in the PATH.
This fix changes the nature of the -Dsbt.script option. It was
an argument of the main class xsbt.boot.Boot, it's now a system
property and thus it's used to launch the sbt server.

Fixes https://github.com/sbt/sbt/issues/6760
2021-12-26 01:47:21 -05:00
Eugene Yokota 0f8ac0f543 Zinc 1.6.0 2021-12-26 01:44:00 -05:00
Eugene Yokota 645cebccac IO 1.6.0 2021-12-26 00:28:09 -05:00
eugene yokota 45aa8cb75c
Merge pull request #6761 from gontard/fixBspConfig
Ensure sbtConfig argv does not need sbt in the path
2021-12-25 14:48:57 -05:00
gontard 780665a60c Ensure sbtConfig argv does not need sbt in PATH
Before, the BSP config .bsp/sbt.json generated by `sbt bspConfig`
contained a command line which required the sbt binary in the PATH.
This fix changes the nature of the -Dsbt.script option. It was
an argument of the main class xsbt.boot.Boot, it's now a system
property and thus it's used to launch the sbt server.

Fixes https://github.com/sbt/sbt/issues/6760
2021-12-24 16:25:58 +01:00
eugene yokota 450c87f576
Merge pull request #6726 from Nirvikalpa108/remove-log4j
Removes deprecated log4j
2021-12-20 01:09:02 -05:00
Eugene Yokota df46c08051 sbt 1.6.0-RC2 2021-12-18 18:11:10 -05:00
eugene yokota 4307352f87
Merge pull request #6756 from eed3si9n/wip/log4j2.17.0
[1.6.x] log4j 2.17.0
2021-12-18 15:53:19 -05:00
Eugene Yokota 57e1044f5b log4j 2.17.0 2021-12-18 15:05:31 -05:00
eugene yokota 7d247ddc6a
Merge pull request #6754 from sbt/1.6.x
Merge 1.6.x
2021-12-18 02:15:33 -05:00
eugene yokota 67f86b9175
Merge pull request #6753 from eed3si9n/wip/coursier
[1.6.x] lm-coursier-shaded 2.0.10
2021-12-18 00:16:06 -05:00
Eugene Yokota e56b199300 lm-coursier-shaded 2.0.10 2021-12-17 23:21:26 -05:00
eugene yokota e944017d79
Merge pull request #6750 from eed3si9n/wip/log4j
[1.6.x] log4j 2.16.0
2021-12-15 16:38:25 -05:00