Commit Graph

11318 Commits

Author SHA1 Message Date
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
Samuel CLARENC e6c2ce084a Add the tag "integration-test" to the it configuration in BSP. 2021-06-17 09:00:15 +02:00
Eugene Yokota eec3c32cc8 sbt 1.5.4 2021-06-13 23:34:18 -04:00
eugene yokota df11a16444
Merge pull request #6544 from eed3si9n/wip/bump
Zinc 1.5.5
2021-06-13 22:50:58 -04:00
Eugene Yokota 69d0023c45 Zinc 1.5.5 2021-06-13 21:49:21 -04:00
eugene yokota a9402a61ae
Merge pull request #6538 from adpi2/fix-mkScalaInstance
Fix compiler class loader jars
2021-06-12 01:00:22 -04:00
Adrien Piquerez 75a55a10df fix compiler class loader jars 2021-06-11 10:41:40 +02:00
eugene yokota f18faafd1f
Merge pull request #6539 from adpi2/build-exit-notification
Close BSP channel after receiving build/exit notification
2021-06-09 19:23:27 -04:00
Adrien Piquerez cbc1c87974 Disconnect BSP server when build/exit 2021-06-09 18:01:09 +02:00
eugene yokota fabeed2227
Merge pull request #6534 from sbt/dependabot/github_actions/olafurpg/setup-scala-12
Bump olafurpg/setup-scala from 10 to 12
2021-06-07 16:58:01 -04:00
dependabot[bot] 7bf1490cbf
Bump olafurpg/setup-scala from 10 to 12
Bumps [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) from 10 to 12.
- [Release notes](https://github.com/olafurpg/setup-scala/releases)
- [Commits](https://github.com/olafurpg/setup-scala/compare/v10...v12)

---
updated-dependencies:
- dependency-name: olafurpg/setup-scala
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 08:12:22 +00:00
eugene yokota dda0a73281
Merge pull request #6532 from eed3si9n/wip/ipcsocket
ipcsocket 1.3.1
2021-06-05 16:17:28 -04:00
Eugene Yokota 367816ccc1 ipcsocket 1.3.1
Fixes https://github.com/sbt/sbt/issues/6531
2021-06-05 15:34:41 -04:00
eugene yokota 9e98b6daa1
Merge pull request #6529 from eed3si9n/wip/use_1.5.3
Use sbt 1.5.3
2021-06-01 11:53:39 -04:00
Eugene Yokota 2ed0574f95 Use sbt 1.5.3 2021-06-01 00:26:20 -04:00
Eugene Yokota bcda2115b1 Update the Sonatype Release URL test 2021-05-31 23:22:46 -04:00
Eugene Yokota 70a50e5c54 sbt 1.5.3 2021-05-31 23:15:07 -04:00
eugene yokota 17abe98a3a
Merge pull request #6528 from eed3si9n/wip/bump
Update modules
2021-05-31 22:33:20 -04:00
Eugene Yokota e30bd67275 Update modules 2021-05-31 22:06:59 -04:00
eugene yokota dcae3a161f
Merge pull request #6525 from sbt/dependabot/github_actions/actions/cache-2.1.6
Bump actions/cache from 2.1.5 to 2.1.6
2021-05-31 15:46:08 -04:00
dependabot[bot] a4dc402a9a
Bump actions/cache from 2.1.5 to 2.1.6
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-31 05:54:08 +00:00
eugene yokota f2f884436b
Merge pull request #6499 from pikinier20/scaladoc-scalac-options
Add missing scalac options to scaladoc task configuration
2021-05-30 22:06:32 -04:00
eugene yokota a0f22213b5
Merge pull request #6523 from eatkins/discover-main-class
Disable multiple main class warning w/ qualified key
2021-05-30 21:25:05 -04:00
Ethan Atkins 7dbf7978e9 Disable multiple main class warning w/ qualified key
If the user runs foo/runMain in a project with multiple main classes,
sbt will still warn the user about their being multiple main classes
even though this is a pointless warning since the user either is running
runMain which requires a main class. The run task is also excluded since
by default it prompts the user with a main class selector. The previous
logic for doing this filtering was bad because it only looked at the
first command in a sequence and couldn't handle the foo/runMain case
since it was looking for an exact match with `run` or `runMain`. This
commit relaxes those restrictions to look at all of the strings in the
command as well as splitting the string to check if the last part of the
key ends in run or runMain. This logic could theoretically be incorrect
if the user wrote an input task that was expecting run or runMain as
user input but even in that case the only consequence would be that they
wouldn't see the multiple main class warning which generally isn't all
the helpful unless you are packaging a jar that expects there to be only
one main class. It seems unlikely that that the user would be running a
custom input task that is both packaging a jar and expecting run or
runMain as input strings.
2021-05-30 14:48:05 -07:00
eugene yokota ea2f496f5f
Merge pull request #6522 from mkurz/scala_upgrades
Scala 2.12.14 / 2.13.6
2021-05-28 16:20:21 -04:00
Matthias Kurz ee460e0043
Upgrade semanticdb to newest version which supports Scala 2.12.14 2021-05-28 21:44:10 +02:00
Matthias Kurz 3f7193f91a
Update kind-projector 2021-05-28 18:13:28 +02:00
Matthias Kurz fbfc272171
Scala 2.12.14 / 2.13.6 2021-05-28 18:13:28 +02:00
Filip Zybała 236f419f88 Add condition preventing errors on 3.0.0. Add scripted test for running doc on Scala.js project 2021-05-27 14:56:47 +02:00
eugene yokota fdcff13804
Merge pull request #6514 from eed3si9n/wip/sbtn-download
Implement sbtn downloading
2021-05-23 17:48:03 -04:00
eugene yokota 1ae2d9d59c
Merge pull request #6517 from Nirvikalpa108/fix-nowarn
Fix @nowarn annotation in old sbt plugin style
2021-05-21 13:58:16 -04:00
Amina Adewusi 2e6fb3f2a5 Fix nowarn in both old & new sbt plugin styles
Fixes #6430.

What is the problem?
As detailed in #6430, the @nowarn annotation was not suppressing
warnings, even after the first attempt to fix this in PR#6431.

This first PR fixed the problem for projects using
enablePlugins(SbtPlugin), but not for those using sbtPlugin := true.

Why is this a valuable problem to solve?
The annotation was not working as users would expect.

What is this solution?
I have moved the scalacOptions change from SbtPlugin.projectSettings
to the scalacOptions in the JvmPlugin settings.

Has this been tested?
Yes, a test has been added. Also, this branch was tested successfully
on the twinagle repo (https://github.com/soundcloud/twinagle/pull/224).
2021-05-21 18:11:24 +01:00
Eugene Yokota 90b938e480 Implement sbtn downloading 2021-05-17 16:50:54 -04:00
eugene yokota d78683141f
Merge pull request #6511 from bjaglin/duplicated-src
dedup unmanagedSourceDirectories for Scala 3
2021-05-15 17:55:26 -04:00
Brice Jaglin 622eabfa95 dedup unmanagedSourceDirectories for Scala 3
For Scala 3, scalaBinaryVersion == epochVersion
2021-05-15 22:14:51 +02:00
eugene yokota 91704c755c
Merge pull request #6504 from adpi2/public-mkScalaInstance
Expose makeScalaInstance
2021-05-10 10:05:05 -04:00