Commit Graph

11483 Commits

Author SHA1 Message Date
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 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
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
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
eugene yokota fb5f0a8895
Merge pull request #6731 from sbt/dependabot/github_actions/actions/cache-2.1.7
Bump actions/cache from 2.1.6 to 2.1.7
2021-12-05 01:30:13 -05:00
eugene yokota 10598a36a9
Merge pull request #6735 from kpodsiad/test-fingerscans
Add `public` modifier to the SubclassFingerscan and AnnotatedFingerscan.
2021-12-05 01:29:36 -05:00
Amina Adewusi 97cdf21416 Remove log4j
WIP
2021-12-03 17:13:29 +00:00
Kamil Podsiadlo 1572908c8a Add `public` modifier to the SubclassFingerscan and AnnotatedFingerscan. 2021-12-01 14:17:58 +01:00
Eugene Yokota daa57c4e1c sbt 1.6.0-RC1 2021-11-29 12:49:43 -05:00
eugene yokota 87c618ab4c
Merge pull request #6732 from eed3si9n/wip/bump 2021-11-29 07:01:13 -05:00
Eugene Yokota 2f2ceeb9c9 Update banner 2021-11-29 05:32:33 -05:00
Eugene Yokota bdccb6cbd5 Zinc 1.6.0-M2 2021-11-29 05:18:00 -05:00
dependabot[bot] ba4d0f3f27
Bump actions/cache from 2.1.6 to 2.1.7
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 04:03:14 +00:00
eugene yokota cf3d286499
Merge pull request #6730 from eed3si9n/wip/build-server-reporter
[1.6.x] Fixes fake position handling, take 2
2021-11-28 02:54:29 -05:00
eugene yokota 0b98648454
Merge pull request #6728 from eed3si9n/wip/noserver
--no-server mode
2021-11-27 23:46:39 -05:00
Eugene Yokota 5b179395ec Fixes fake position handling, take 2
Fixes #6720
Ref #5994

Problem
-------
Sometimes the compiler returns a fake position such as `<macro>`.
This causes this causes InvalidPathException on Windows if we try
to convert it into NIO path.

Solution
--------
Looks for less-than sign in the VirtualFileRef and skip those.
Since BSP requires the diagnostic info to be associated with
files, we probably can't do much.
2021-11-27 23:42:20 -05:00
eugene yokota 54f6a49a9d
Merge pull request #6729 from eed3si9n/wip/timeout
Extend supershell close timeout
2021-11-27 23:28:12 -05:00
Eugene Yokota e3afa845ec Extend supershell close timeout
Fixes #6592

Problem
-------
On Heroku there's timeout.

Solution
--------
This seems to be coming from supershell closing the executor.
Extend the timeout to 30s.
2021-11-27 21:26:52 -05:00
Eugene Yokota f11a25a9c9 Add test 2021-11-27 21:19:38 -05:00
Eugene Yokota 7d429c6724 --no-server mode
Fixes #6530
Ref #6101

Problem
-------
Although having sbt server up by default is beneficial to well-tested
platforms like macOS, on less tested setups various native and/or
native-adjacent techniques we use could end up causing instability.

Solution
--------
This adds `--no-server` as a quick way of telling sbt not to start up
the sbt server or create virtual terminal.
2021-11-27 20:20:42 -05:00
David Francoeur a448b1caab
Load credentials from SBT_CREDENTIALS (#6724)
Load credentials from SBT_CREDENTIALS
Prefer sys.env to System.getenv
2021-11-27 02:44:49 -05:00
eugene yokota 64e05bdf68
Merge pull request #6725 from eed3si9n/wip/coursier
lm-coursier 2.0.9
2021-11-26 00:39:51 -05:00
Eugene Yokota db17b5a462 lm-coursier 2.0.9
https://github.com/coursier/sbt-coursier/releases/tag/v2.0.9
https://github.com/coursier/coursier/releases/tag/v2.1.0-M1
2021-11-25 21:32:44 -05:00
eugene yokota b2f0b7dada
Merge pull request #6719 from eed3si9n/wip/line-endings
Fix line endings in msi
2021-11-20 13:33:43 -05:00
Eugene Yokota 307f46a3c0 Fix line endings in msi
Fixes #6717
2021-11-19 20:41:39 -05:00
eugene yokota aa22c02d84
Merge pull request #6716 from eed3si9n/wip/global-keys
Fixes tab completion of global keys
2021-11-16 19:51:58 -05:00
Eugene Yokota 6c68b843d5 Fixes tab completion of global keys
Fixes #1373
Fixes #6715

Following my own PR #2855 around `ThisBuild`, this attempts to fix the
tab completion of globally scoped keys from the shell.
2021-11-16 19:23:25 -05:00
eugene yokota 8f1c0f61a1
Merge pull request #6714 from xuwei-k/position-macro-scala-3
SourcePositionMacro for Scala 3. enable Scala 3 build for some `util` modules
2021-11-16 09:24:18 -05:00
xuwei-k 5c90a84c72 SourcePositionMacro for Scala 3 2021-11-16 16:32:31 +09:00
eugene yokota d01cdd53e1
Merge pull request #6713 from xuwei-k/scala-3-build-settings-1
Update build settings for Scala 3
2021-11-16 01:28:30 -05:00
xuwei-k 38f5449084 Update build settings for Scala 3 2021-11-16 10:19:26 +09:00
kenji yoshida 1f4517d5cc update hedgehog and scalacheck
prepare Scala 3
2021-11-15 13:13:33 +09:00
eugene yokota b3aae681bf
Merge pull request #6711 from xuwei-k/fix-scala-2-13-warn
fix Scala 2.13 warnings
2021-11-14 21:53:57 -05:00
eugene yokota ad6f07bfee
Merge pull request #6710 from xuwei-k/update-scalatest
Update scalatest
2021-11-14 21:34:29 -05:00
xuwei-k 535b15b83e fix Scala 2.13 warnings 2021-11-14 22:59:34 +09:00
xuwei-k aa8b1141f8 Update scalatest 2021-11-14 22:03:59 +09:00
eugene yokota fe02f99a74
Merge pull request #6708 from sbt/hedgehog-resolver
remove unused `bintray-scala-hedgehog` resolver
2021-11-12 19:30:18 +01:00