Commit Graph

2702 Commits

Author SHA1 Message Date
Ethan Atkins fcfe4333fe Consolidate and optimize input stream json reading
We had similar code for reading json frames from an input stream in
NetworkChannel and ServerConnection. I reworked and consolidated this
logic into a shared method in ReadJsonFromInputStream.

This commit also removes the ObjectMessage reporting methods that
weren't doing anything.
2020-06-24 19:19:06 -07:00
Ethan Atkins b0a859acb5 Use print + flush instead of println
With println, it is possible for lines to get interleaved because
another thread may call flush before the println appends a newline.
2020-06-24 19:19:06 -07:00
Ethan Atkins af5afef271 Add option to skip collectAnalysis on network init
The collectAnalysis task an be a bit slow and delays client connections
from running commands. This commit adds an option to skip the analysis
if it isn't needed. The default behavior is left as it was.
2020-06-24 19:19:06 -07:00
Ethan Atkins fe397351df Remove dead external hooks code
These settings were only used by the external hooks implementation that
was removed.
2020-06-24 19:19:06 -07:00
eugene yokota 778264a319
Merge pull request #5618 from adpi2/topic/metals-support
Add suggestion about semanticdb when Metals connect to sbt
2020-06-24 14:19:04 -04:00
eugene yokota e323f1f713
Merge pull request #5637 from adpi2/feature/bsp-custom-config
Add BSP support for IntegrationTest and other custom configs
2020-06-23 16:11:14 -04:00
Maksim Ochenashko 71ea117a39 Use contraband for generation of RemoteCacheArtifact 2020-06-21 09:41:56 +03:00
Maksim Ochenashko 0c07fa1851 Allow customization of remote cache artifacts 2020-06-20 14:05:41 +03:00
adpi2 56eed20b34 add support for IntegrationTest and custom configs in BSP
In global bspWorkspace setting, retrieve all projects and all configurations that contain the bspTargetIdentifier setting, so that:
- the IntegrationTest configuration, when added to a project, is automatically associated to a BSP target
- a custom configuration that contains the `Defaults.configSettings` is also associated to a BSP target
2020-06-18 16:32:10 +02:00
eugene yokota 9f9bb9daa2
Merge pull request #5634 from eed3si9n/wip/missingok
Fixes missingOk under Coursier
2020-06-17 21:06:40 -04:00
Eugene Yokota 5cce074b83 Fixes missingOk under Coursier
Fixes https://github.com/sbt/sbt/issues/4707
Ref https://github.com/coursier/sbt-coursier/pull/212
2020-06-17 20:06:25 -04:00
Maksim Ochenashko 49e7d71cbc Delete META-INF folder after remote cache pull 2020-06-17 13:01:47 +03:00
eugene yokota 87e57b5390
Merge pull request #5619 from bjaglin/patch-1
exclude effectful initialize setting key from linting
2020-06-16 19:53:07 -04:00
Adrien Piquerez 0738edc9a5
Apply logging style
Co-authored-by: eugene yokota <eed3si9n@gmail.com>
2020-06-16 09:43:22 +02:00
Maksim Ochenashko 3e8073151b Unify calculation of remoteCacheId and remoteCacheIdCandidates 2020-06-16 09:15:42 +03:00
Brice Jaglin 561d0ef602 exclude effectful initialize setting key from linting 2020-06-16 01:08:15 +02:00
adpi2 159171bba5 Add suggestion about semanticdb when Metals connect to sbt
Try parse the required semanticdbVersion in the initialization request metadata
Issue a warning if the semanticdb plugin is not enabled
Issue a warning if the semanticdb version is lower than the required
2020-06-15 16:57:49 +02:00
Eugene Yokota 8789d20724 -Dsbt.semanticdb=true to enable SemanticDB 2020-06-14 17:14:02 -04:00
Eugene Yokota 837dcbb5a6 SemanticDB 4.3.15 2020-06-14 16:53:36 -04:00
Eugene Yokota 5a37ef14fc Zinc 1.4.0-M6 2020-06-14 15:55:37 -04:00
Eugene Yokota 033ff1d8a5 Make JSON parsing errors more consistent 2020-06-11 20:31:13 -04:00
Eugene Yokota cad84afc6d Drop old application/sbt-x1 protocol 2020-06-11 16:22:07 -04:00
eugene yokota 975e3db43e
Merge pull request #5558 from eed3si9n/wip/selective
Selective functor
2020-06-10 17:39:13 -04:00
eugene yokota a83be809ab
Merge pull request #5552 from eed3si9n/wip/promise
implement Def.promise
2020-06-10 17:38:23 -04:00
Eugene Yokota c8f52e6281 Add atMost parameter 2020-06-10 15:30:39 -04:00
Eugene Yokota b78e4f0919 implement Def.promise
This adds `Def.promise` a facility that wraps `scala.concurrent.Promise`. Project layer, there's an implicit for task-that-returns-promise (`Def.Initialize[Task[PromiseWrap[A]]]`) that would inject `await` method, which returns a task. This is a special task that is tagged with `Tags.Sentinel` so that it will bypass the concurrent restrictions. Since there's no CPU- or IO-bound work, this should be ok.

The purpose of this promise for long-running task to communicate with another task midway.
2020-06-10 15:16:25 -04:00
Eugene Yokota 6dd39e7ab8 try last 5 commits to look for remote cache
In case there are a few local commits ahead of the remote cache, this would still grab the close point in the history to resume the build.
2020-06-10 12:55:30 -04:00
Eugene Yokota 585f8399ba implement RemoteCache
This adds `pushRemoteCache`, `pushRemoteCacheTo`, `pullRemoteCache`, etc to implement cached compilation facility.

In addition, the analysis file location is now made more clear.
2020-06-09 14:28:40 -04:00
eugene yokota a109f3d76d
Merge pull request #5526 from 3rwww1/fix/npe-coursier-null-cred-realm
Fix coursierint NPE when credential realm is null
2020-06-09 14:24:24 -04:00
Eugene Yokota 0d15fe1162 Remove HTTP support without explicit opt-in
Ref https://github.com/sbt/sbt/issues/4905
2020-06-07 01:50:41 -04:00
Eugene Yokota ada490e61d Fixes appResolvers returning None
Fixes https://github.com/sbt/sbt/issues/5582
Ref https://github.com/sbt/sbt/pull/5576

In #5576 I added `m.allowInsecureProtocol`, which causes reflection error for older launcher.jar, which then falls back to None appResolvers.
2020-05-30 17:52:39 -04:00
Eugene Yokota 9264b128ef Lower-case some messages 2020-05-29 02:55:12 -04:00
Eugene Yokota 2bf1bcc884 Add welcome banner with Java version
Fixes https://github.com/sbt/sbt/issues/5544
2020-05-29 02:35:59 -04:00
eugene yokota 24f367fa07
Merge pull request #5576 from eed3si9n/wip/bumplauncher
update to launcher 1.1.4
2020-05-28 17:00:00 -04:00
Eugene Yokota 4bb4c3a9b6 launcher 1.1.4
Forward `m.allowInsecureProtocol` to `MavenRepository`.
2020-05-28 16:21:46 -04:00
Adrien Piquerez a498a20627
Merge branch 'develop' into topic/build-server-protocol 2020-05-28 08:57:23 +02:00
Adrien Piquerez 0789fd7be6 Use java command in BspConnectionDetails 2020-05-25 13:32:48 +02:00
Adrien Piquerez b184be860f Add headers 2020-05-25 10:43:54 +02:00
Adrien Piquerez 914b592fb2 scalafmt 2020-05-25 09:40:54 +02:00
Adrien Piquerez 4f00abf1ba BSP is part of the JVM plugin 2020-05-22 13:39:59 +02:00
Adrien Piquerez c11ee3269c Add BspCompilationTaskProgress 2020-05-22 11:15:47 +02:00
Dale Wijnand ff97fb6068 Avoid making NPEs out of OOMEs!
(cherry picked from commit ba29f65f17c7b9d9ac5bf79d0934cf23438a16b4)
2020-05-19 21:30:53 +01:00
Adrien Piquerez a31747758c Create BSP connection file at server startup 2020-05-18 09:35:14 +02:00
Eugene Yokota 45e8426d27 def taskIf[A](a: A): Initialize[Task[A]]
Make `Def.taskIf` accept pure `A` type, as opposed to `Def.task { ... }`.
2020-05-17 23:44:35 -04:00
Eugene Yokota c6f62293f1 Def.taskIf macro
Def.taskIf accepts an if-expression or a block ending in an if-expression.
2020-05-17 23:36:04 -04:00
Eugene Yokota fc791cc23e Rewrite tasks using Def.ifS 2020-05-17 23:36:04 -04:00
Adrien Piquerez c80fe525c6 add BspClient 2020-05-16 09:52:21 +02:00
Adrien Piquerez 2c8a322bd8 bspWorkspace is a setting 2020-05-16 09:52:21 +02:00
Adrien Piquerez f3bce7e976 fix BuildServerReporter 2020-05-16 09:52:21 +02:00
Adrien Piquerez 24f6a6f290 add BSP buildTarget/dependencySources 2020-05-16 09:52:21 +02:00