Commit Graph

11429 Commits

Author SHA1 Message Date
Amina Adewusi 3c81e08fa2 Migrates Treeview.scala to use Contraband
Migrates TreeView.scala to use Contraband from scala.util.parsing.json,
because this is now deprecated.
The TreeView logic is used in the dependencyBrowseTree task.
2021-11-12 16:52:12 +00:00
eugene yokota bcbef795e7
Merge pull request #6703 from adpi2/fix-6698 2021-11-04 04:29:18 -04:00
Adrien Piquerez c77d6dfb38 Fix #6698: Synchronize all RPC messages with systemOut notifications
`systemOut` notifications are buffered so that they are sent at most
once every 20 millisecond. Other RPC messages are not buffered.
As a consequence, some RPC messages can pass in front of some
systemOut notifications.
That's why `sbt --client run` can exit before it receives all the logs.

In general I think it is safer to maintain the order of all messages.
To do so we can force the flush of systemOut before each RPC message.
2021-11-03 10:21:02 +01:00
eugene yokota 530505d063
Merge pull request #6701 from adpi2/bsp-sources-in-base
[BSP] Handle base sources
2021-10-29 17:09:22 -04:00
Adrien Piquerez 75d3bf2b5f [BSP] remove duplicated sources in sbt build target
Also remove the base directory (`./project/`) from the list of source directories
2021-10-29 15:40:00 +02:00
Adrien Piquerez e64c71dd58 [BSP] Support base source files 2021-10-29 15:40:00 +02:00
eugene yokota bc95ab25a2
Merge pull request #6693 from kijuky/apply-asciigraphwidth-to-dependencytree
Enable the asciiGraphWidth setting to the dependencyTree tasks. #5962
2021-10-22 00:11:31 -04:00
eugene yokota 9e71209cdd
Merge pull request #6697 from er1c/6696-killall-runner-command
[#6696] Add shutdownall to sbt runner to shutdown all sbt-launch processes
2021-10-22 00:06:53 -04:00
Eric Peters 9516e10dbe [#6696] Add shutdownall to sbt runner to shutdown all sbt-launch processes 2021-10-21 10:42:42 -07:00
kijuky 890ecdc556 Overloaded without passing null. 2021-10-19 13:51:15 +09:00
kijuky 76c1b68516 Enable the asciiGraphWidth setting to the dependencyTree tasks. #5962 2021-10-19 02:15:31 +09:00
eugene yokota 4f102fc46f
Merge pull request #6691 from eed3si9n/wip/github_actions
Switch to using actions/setup-java@v2
2021-10-16 16:50:37 -04:00
Eugene Yokota 376823bf08 Use GitHub Action's branching 2021-10-16 16:27:15 -04:00
Eugene Yokota 9d9016f4cf Switch to using actions/setup-java@v2 2021-10-16 15:59:58 -04:00
eugene yokota b795b622d7
Merge pull request #6680 from er1c/mainlogging-defaultscreen-args
Update MainAppender.defaultScreen to use passed in console arg #6678
2021-10-16 13:48:08 -04:00
eugene yokota 7b899f035e
Merge pull request #6688 from xuwei-k/ignoreScalaLibrary-test
re-enable `dependency-graph` scripted tests
2021-10-11 12:05:50 -04:00
xuwei-k 9052c745b1 re-enable `dependency-graph` tests 2021-10-11 20:40:24 +09:00
eugene yokota adc217000b
Merge pull request #6673 from kxbmap/scripted-java-home
Make javaHome that forks scripted tests configurable
2021-10-05 11:08:53 -04:00
kxbmap 59f178a4c4 Make javaHome that forks scripted tests configurable
Normally scripted tests are forked using the JVM that is running sbt.
If set `scripted / javaHome`, forked using it.

```
scripted / javaHome := Some(file("/path/to/jdk-x.y.z"))
```

Or use `java++` command before scripted.

```
sbt> java++ 11!
sbt> scripted
```
2021-10-05 00:35:56 +09:00
eugene yokota 5f56fce580
Merge pull request #6684 from kxbmap/win-jdk-distributions
Add Windows Java home selectors for some distributions
2021-10-03 11:18:37 -04:00
kxbmap 24e7398b5b Add Windows Java home selectors for some distributions that provides an installer
- Eclipse Temurin
- IBM Semeru Runtimes
- Microsoft Build of OpenJDK
- Amazon Corretto
- Azul Zulu Builds of OpenJDK
- Liberica JDK
2021-10-02 16:56:12 +09:00
eugene yokota 35003a0bd7
Merge pull request #6675 from nimatrueway/fix-cycle-in-browse-tree
Handle cycles while rendering dependency tree to json
2021-09-29 23:57:51 -04:00
Eric Peters c1ed109f89 Update MainAppender.defaulScreen to use passed in console arg #6678 2021-09-29 07:39:09 -07:00
Eric Peters 804bd4b8b5 Rename internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala to MainAppender.scala to match contents 2021-09-29 07:34:20 -07:00
Nima Taheri fcd7a3bef2 Handle cycles while rendering json dependency tree to json 2021-09-28 11:28:20 -07:00
eugene yokota c2cd9a0a71
Merge pull request #6672 from eed3si9n/wip/temurin17
Eclipse Temurin 17
2021-09-25 20:00:12 -04:00
Eugene Yokota 0c3b76cbf2 Eclipse Temurin 17 2021-09-25 19:22:20 -04:00
Eugene Yokota 98a65b124e Bump the builtin_sbt_version to 1.5.5 2021-09-19 20:14:44 -04:00
eugene yokota 6aed014678
Merge pull request #6668 from eed3si9n/wip/bump
Zinc 1.6.0-M1
2021-09-19 19:51:46 -04:00
Eugene Yokota 4370bc29ba Incremental compilation of constant folding 2021-09-19 19:51:01 -04:00
Eugene Yokota f6b993f91b Zinc 1.6.0-M1 2021-09-19 17:34:40 -04:00
eugene yokota 5532af17c7
Merge pull request #6629 from er1c/add-sbt-cache-arg
Add --sbt-cache argument and update localCacheDirectory key description
2021-09-19 14:02:34 -04:00
eugene yokota ce3015a2bf
Merge pull request #6665 from eed3si9n/wip/drop_trapexit
Drop TrapExit
2021-09-19 13:25:15 -04:00
Eugene Yokota 0413727796 Drop TrapExit
Fixes https://github.com/sbt/sbt/issues/6558

Problem
-------
sbt uses SecurityManager feature of JDK to trap `sys.exit` call during
`run`-like tasks, since we emulate `run` and `console` as function calls.
JDK 17 deprecated SecurityManager and it's printing warnings.

Solution
--------
About 10 years go, `exit` was a convenient way of quitting both Scala
REPL and sbt shell. Scala 2.11 broke this by removing the `Predef.exit`.
We still need to worry about `run` potentially calling `sys.exit`
but that can be handled using fork feature.
In the long-run, it probably is better to be JDK 17 compatible.
2021-09-19 12:47:59 -04:00
eugene yokota 45d6e13163
Merge pull request #6662 from eed3si9n/wip/jdk17
JDK 17
2021-09-19 02:14:51 -04:00
Eugene Yokota 04672d3118 Mark failing scripted tests pending 2021-09-19 01:47:24 -04:00
eugene yokota 2dad7ea763
Merge pull request #6664 from eed3si9n/wip/scala_2.12.15
Bump scala version to 2.12.15
2021-09-18 19:20:15 -04:00
Eugene Yokota 6564090976 Increase timeout for progress test 2021-09-18 18:45:37 -04:00
Eugene Yokota 8b9cbb3311 Follow up on Scala 2.12.15 bump 2021-09-18 18:08:26 -04:00
Amina Adewusi 505492ed33 Add -Xsource:3 flag
Adding Scala 3 compatible mode for the compilation of build.sbt files.
2021-09-17 18:16:11 +01:00
Amina Adewusi c013d1180c Bump scala version to 2.12.15 2021-09-17 17:46:07 +01:00
Eugene Yokota e4f29d37a4 nowarn on TrapExit 2021-09-17 05:14:11 -04:00
Eugene Yokota c31f12d884 JDK 17 2021-09-17 05:02:32 -04:00
eugene yokota 8d10151731
Merge pull request #6656 from Nirvikalpa108/crossSbtVersions/6571
Fix for crossSbtVersions triggering lintBuild
2021-09-12 01:25:28 -04:00
Amina Adewusi ea67d3376b Fix for crossSbtVersions triggering lintBuild
Currently crossSbtVersions is incorrectly generating a warning that it
is an unused setting (see https://github.com/sbt/sbt/pull/5153). This
PR fixes this by adding it to the list of excluded lint keys.

Fixes #6571.
2021-09-12 04:42:01 +01:00
Adrien Piquerez 5f512d9a50
Merge pull request #6642 from hmemcpy/bsp-taskProgress
BSP: implement progress report during compilation
2021-09-11 09:20:26 +02:00
Igal Tabachnik 9986fb6eed Adding a test verifying task progress reports (task start/progress/finish) 2021-09-10 13:06:03 +03:00
Igal Tabachnik 2f589b6713 Extracting progress reporter to own class 2021-09-10 01:02:01 +03:00
Igal Tabachnik f209d0093c BSP tasks report progress during compilation 2021-09-09 23:25:06 +03:00
Adrien Piquerez d197b5b77b
Merge pull request #6638 from hmemcpy/buildTarget/cleanCache
bsp: Implementing `buildTarget/cleanCache`
2021-09-06 12:25:06 +02:00