Commit Graph

17422 Commits

Author SHA1 Message Date
Eugene Yokota a4ce8db55b Manually edit Contraband-generated code 2022-01-30 02:55:26 -05:00
Eugene Yokota e9ee8a6cab Scala 3 2022-01-30 02:55:17 -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
Arman Bilge c17309a914 Deprecate sonatypeRepo, add sonatypeRepos 2022-01-16 21:43:36 +00:00
Arman Bilge a561f3a901 Add shortcut for s01.oss.sonatype.org to Resolver
Fixes https://github.com/sbt/sbt/issues/6787.
See also: https://central.sonatype.org/news/20210223_new-users-on-s01/
2022-01-16 21:34:54 +00:00
naf ff7384fced Remove deprecated command 2021-12-29 21:17:05 -05: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 31db59c825 IO 1.6.0, Util 1.6.0 2021-12-26 01:08:49 -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 a52e34a2b0
Merge pull request #391 from peter-janssen/maven-repo-local-property
Respect maven.repo.local property
2021-12-23 10:53:18 -05:00
Peter Janssen f89ba48906 Respect maven.repo.local property 2021-12-23 16:38:52 +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
Michal Augustýn 7a2d9981f7 chore(deps): log4j 2.16.0 2021-12-15 02:36:59 -05:00
Alexandre Archambault e43c88a50e
Update coursier to 2.1.0-M2-1 (#371) 2021-12-15 01:01:42 +01:00
Alexandre Archambault 908ad85ac1
Merge pull request #368 from alexarchambault/coursier-2.1.0-M2
Update coursier to 2.1.0-M2
2021-12-15 00:55:29 +01:00
Alexandre Archambault 09edac2f10 Stop running neo-sbt-scalafmt test with sbt-coursier
Having issues running it on Linux on the CI. It seems it runs fine on
sbt-lm-coursier (all OSes), or on Windows (CI) or macOS (local machine).

Hope it's not a sign of a more serious problem…
2021-12-15 00:25:23 +01:00
Alexandre Archambault 6b0ae3bd9f Update coursier to 2.1.0-M2 2021-12-15 00:18:13 +01:00
eugene yokota 6c53784826
Merge pull request #6747 from raboof/patch-1
discourse -> GH Discussions
2021-12-13 15:06:36 -05:00
Arnout Engelen 1a2722d075
discourse -> GH Discussions 2021-12-13 20:11:30 +01:00
Scala Steward 935e59c8ea
Update scala-collection-compat to 2.6.0 (#366) 2021-12-12 23:33:37 +01:00
eugene yokota 851fc201c6
Merge pull request #6744 from eed3si9n/wip/log4j-zeroday-1.6.x
[1.6.x] Update log4j
2021-12-10 16:13:21 -05:00
Eugene Yokota 4a75007862 Update log4j 2021-12-09 23:49:00 -05:00
eugene yokota ccc6cf6818
Merge pull request #6741 from sbt/1.6.x
Merge 1.6.x to develop
2021-12-07 11:06:03 -05:00
eugene yokota bed2e5bef9
Merge pull request #6740 from adpi2/backport-1.6
[1.6.x] register all forked processes
2021-12-06 11:52:42 -05:00
Adrien Piquerez 0fef804b18 Fix #6738: register all forked process 2021-12-06 09:12:38 +01:00
eugene yokota f70ef045b6
Merge pull request #6739 from adpi2/fix-cancel
Fix #6738: register all forked process
2021-12-05 12:38:17 -05:00
Adrien Piquerez c1d20f563b Fix #6738: register all forked process 2021-12-05 15:38:56 +01:00