luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,353 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

11353 Commits

Author SHA1 Message Date
William Narmontas febccde3e7 Building on #6353 to help identify the issue of #6101 for Windows users. 2021-07-24 19:59:00 +01:00
eugene yokota ab05465ef4
Merge pull request #6593 from adpi2/fix-6575 
Use `-Dsbt.script` to start sbt server
 2021-07-22 12:09:35 -04:00
Adrien Piquerez 966633aa81 Fix duplicated -Dsbt.script 2021-07-22 09:17:22 +02:00
Adrien Piquerez 2287f3e384 Find sbt.bat in windows $PATH 2021-07-22 09:17:22 +02:00
Adrien Piquerez c4e6cf54d2 Use java to start BSP client 2021-07-22 09:17:22 +02:00
Adrien Piquerez c31503cca2 Warn when using -sbt-launch-jar 2021-07-22 09:17:22 +02:00
eugene yokota d4162cce04
Merge pull request #6566 from adpi2/fix-6010 
[BSP] Send diagnostics and meaningful error message when reloading fails
 2021-07-12 16:01:48 -04:00
Adrien Piquerez c9ca2d4afa Use `-Dsbt.script` to start sbt server 
In order to start the sbt server we must use the sbt script because
it is the only way to load the .sbtopts and the .jvmopts file properly.

To do so the sbt script can pass a -Dsbt.script prop to the java server.
It is used in the NetworkClient to start the server, and it is replicated
in the BuildServerConnection file (.bsp/sbt.json).
 2021-07-12 14:20:17 +02:00
Adrien Piquerez ba73f87296 add scaladoc in EvalReporter 2021-07-12 09:28:39 +02:00
eugene yokota 5f4798fa76
Merge pull request #6589 from eed3si9n/bport/launch 
[1.5.x] launcher 1.3.3
 2021-07-11 03:04:45 -04:00
eugene yokota b75895da87
Merge pull request #6588 from eed3si9n/wip/launch 
launcher 1.3.3
 2021-07-11 02:30:50 -04:00
Eugene Yokota d246059925 launcher 1.3.3 
Fixes https://github.com/sbt/sbt/issues/6587
 2021-07-11 02:07:44 -04:00
Eugene Yokota 181052fddb launcher 1.3.3 
Fixes https://github.com/sbt/sbt/issues/6587
 2021-07-11 02:04:48 -04:00
eugene yokota 9c10fe4c12
Merge pull request #6480 from adpi2/mk-scala-instance 2021-07-08 08:45:34 -04:00
Adrien Piquerez 5490385303 Remove topLoader hack for dotty 2021-07-08 10:03:47 +02:00
Adrien Piquerez 69795cbed7 Move jansiExclusionLoader to scalaInstanceTopLoader 2021-07-08 10:03:47 +02:00
Adrien Piquerez 63dcb1957b Move scalaInstanceTopLoader to compileBase settings 2021-07-08 09:27:20 +02:00
Adrien Piquerez 94cc9a84ac Fix mima binary issues 2021-07-08 09:25:01 +02:00
Adrien Piquerez b4c6299b9c [BSP] Add test on failing workspace/reload 2021-07-08 09:25:01 +02:00
Adrien Piquerez a76e209dde [BSP] send diagnostics when evaluating build.sbt 
Since build.sbt is compiled/evaluated in `sbt.compiler.Eval`,
this commit introduces a `BuildServerEvalReporter` to redirect
the compiler errors to the BSP clients.

A new `finalReport` method is added in the new `EvalReporter` base class
to reset the old diagnostics.
 2021-07-08 09:25:01 +02:00
Adrien Piquerez 4804cc2fa4 Simplify bspReload cmd by calling doLoadProject 
Fixes #6010: Send real error message when realod failed
 2021-07-08 08:39:46 +02:00
eugene yokota 1497686e57
Merge pull request #6553 from retronym/topic/bsp-sbt-target 
Support the SBT extension in BSP import
 2021-07-05 12:51:34 -04:00
Adrien Piquerez a825c115c2 [BSP] Ignore sbt target in resources request 2021-06-30 10:31:43 +02:00
Jason Zaugg 3d92827af3 Fix compilation error in test 2021-06-30 12:12:24 +10:00
Jason Zaugg df5fb17c6f Exclude create/copy methods of PluginData from MiMa's consideration 2021-06-30 11:25:47 +10:00
Jason Zaugg fe046476b1 Refine and test SBT BSP target 
- Pass source dirs and current list of files
  - Align display name and URI
 2021-06-30 11:19:24 +10:00
Jason Zaugg 0bd736be2a Record build sources in PluginData for BSP 2021-06-28 23:27:33 +10:00
Jason Zaugg 111cc5f473 Add scalacOptions to the SBT targets 2021-06-28 11:02:12 +10:00
Jason Zaugg af14864986 Address review feedback 
- Restore old type of `bspWorkspace` key for backwards compat.
    Instead, introduce `bspFullWorkspace` that includes the
    SBT targets
  - Log a warning if the client requests, e.g. `scalaMainClasses`
    for a SBT target
  - Refactor the code that creates the SBT build targets so it
    doesn't depend on `sbtFullWorkspace`.
  - Add a setting `bspSbtEnabled` to let the user opt-opt of
    SBT target export (e.g. to compensate for a client that does
    not yet support them)
 2021-06-28 11:02:12 +10:00
Jason Zaugg 45e8e2f90d Support the SBT extension in BSP import 
This enables code assist in the .sbt and project/*.scala files
in IntelliJ and any other IDEs that implement this extension.
 2021-06-28 11:02:09 +10:00
eugene yokota e4231ac039
Merge pull request #6565 from adpi2/fix-6562 
[BSP] Respond error after random failure when compiling
 2021-06-25 18:35:01 -04:00
Adrien Piquerez ef7d8b68f6 [BSP] add server test on custom failure when compiling 2021-06-25 10:41:10 +02:00
Adrien Piquerez 852498e992 [BSP] Remove useless log after request failure 2021-06-25 10:41:10 +02:00
Adrien Piquerez f58c8c349a [BSP] add handle for cancelled compilation 2021-06-25 10:41:08 +02:00
Adrien Piquerez f0efbf0f5d Make BSP compile fail after random exception 2021-06-25 10:40:32 +02:00
Adrien Piquerez 74ff1b0a4a Fill error message when BSP task fails 2021-06-24 17:00:22 +02:00
eugene yokota 9274a3e365
Merge pull request #6552 from samuelClarencTeads/bspBuildTargetResources 
Bsp build target resources
 2021-06-21 14:51:49 -04:00
Samuel CLARENC c9562cb1c3
Merge branch 'develop' into bspBuildTargetResources 2021-06-21 16:52:58 +02:00
Samuel CLARENC f3ec202a06 Add resourcesProvider flag to BuildServerCapabilities in BSP contra 2021-06-21 16:51:34 +02:00
Samuel CLARENC a0e3d89855 Implement BSP buildTarget/resources command 2021-06-21 16:51:34 +02:00
eugene yokota f1ec9c05c3
Merge pull request #6556 from sebastian-alfers/fix-carriage-return 
Fix carriage return in supershell progress state
 2021-06-20 19:06:34 -04:00
eugene yokota d3db8388b6
Merge branch 'develop' into fix-carriage-return 2021-06-20 18:07:29 -04:00
eugene yokota 62f6bd15e2
Merge pull request #6557 from eed3si9n/wip/proxy_terminal 
lazily initialize ProxyTerminal to SimpleTerminal
 2021-06-20 18:07:11 -04:00
Eugene Yokota 8628f95e66 lazily initialize ProxyTerminal to SimpleTerminal 
Problem
-------
Console.systemOut is hooked up to Terminal.get, which internally calls
ProxyTerminal, which lets us deffer the wiring of terminal to
activeTerminal. This mechanism allows us to swap out the terminal
capable of standard out forwarding for sbtn.
However, as it stands this breaks the contract of being able to use
Console.systemOut with wrapped inside of `Terminal.withStreams() {...}`.

Solution
--------
Check if `activeTerminal.get` returns `null`, and if so initialize it to
the conventional `Terminal.SimpleTerminal`, which behaves as expected.
 2021-06-20 17:32:42 -04:00
Sebastian Alfers d339863041 Fix carriage return in supershell progress state 2021-06-20 15:41:59 +02:00
eugene yokota 0a33d914db
Merge pull request #6554 from Nirvikalpa108/remote-cache 
fixes remote caching not managing resource files
 2021-06-19 10:23:52 -04:00
Amina Adewusi 24bb4de35e
Merge branch 'develop' into remote-cache 2021-06-18 20:13:55 +01:00
Amina Adewusi f82c0c4c5f fixes remote caching not managing resource files 
What is the problem?
When using remote caching, the resource files are not tracked so if they
have changed, pullRemoteCache will deliver both the old resource file
as well as the changed one.

This is a problem, because it's not the behaviour that our users will
expect and it's not in keeping with the contract of this feature.

Why is this happening?
Zinc, sbt's incremental compiler, keeps track of changes that have
been made. It keeps this in what is called the Analysis file.
However, resource files are not tracked in the Analysis file, so
remote caching is not invalidating the unchanged resource file in
place of the latest version.

What is the solution?
PullRemoteCache deletes all of the resources files. After this,
copyResources is called by PackageBin, which puts the latest
version of the resources back.
 2021-06-18 20:10:07 +01:00
eugene yokota 4926cb4c2b
Merge pull request #6551 from samuelClarencTeads/bspIntegrationTestTag 
Add the tag "integration-test" to the it configuration in BSP.
 2021-06-17 17:30:06 -04:00
Samuel CLARENC 56632c3893 Add resources items to BSP contra 2021-06-17 11:15:32 +02:00