Commit Graph

17422 Commits

Author SHA1 Message Date
Eugene Yokota 7105bf271b setup-gpg 2020-12-02 01:51:29 -05:00
Eugene Yokota 53618c6483 gpg stuff 2020-12-02 01:44:00 -05:00
Eugene Yokota f20064cf81 gpg stuff 2020-12-02 01:40:29 -05:00
eugene yokota 756855ae8b
Merge pull request #42 from sbt/wip/scala3
Use Scala's ABI version to generate suffix
2020-12-02 01:05:05 -05:00
Eugene Yokota 884440b943 Use Scala's ABI version to generate suffix
Fixes #37
To support cross building of 3.0.0-M1 and 3.0.0-M2, use the ABI version
to generate the subproject suffix instead of the partial version (first
    two segments)
2020-12-02 00:50:03 -05:00
Eugene Yokota cb72b1e9f1 Port fix for sandwich and Scala.JS
Ref https://github.com/sbt/sbt/pull/5984
2020-12-02 00:28:57 -05:00
eugene yokota e373bfc3cc
Merge pull request #41 from sbt/wip/build2
Tag-based release
2020-12-02 00:07:31 -05:00
Eugene Yokota f5c7156e24 Tag-based release 2020-12-02 00:00:15 -05:00
eugene yokota bd407ae629
Merge pull request #40 from sbt/wip/actions
Migrate to GitHub Actions
2020-12-01 23:35:45 -05:00
Eugene Yokota 3525d3a108 Disable scala-native tests
Ref https://github.com/scala-native/scala-native/issues/2024
2020-12-01 23:27:58 -05:00
Eugene Yokota 1e5fec7398 Migrate to GitHub Actions 2020-12-01 23:03:21 -05:00
eugene yokota 67f259b4bb
Merge pull request #39 from sbt/wip/actions0
Preliminary GitHub Actions
2020-12-01 22:56:09 -05:00
Eugene Yokota 29ff81ec14 Preliminary GitHub Actions 2020-12-01 22:54:43 -05:00
eugene yokota 0843222509
Merge pull request #36 from keynmol/expose-project-axes
Make the generated subproject self-aware about its own virtual axes
2020-12-01 22:40:19 -05:00
Guillaume Martres 7f3ce50014 dotty-library is called scala3-library now
I though this would help with
https://github.com/lampepfl/dotty/issues/10558 but `sbt repl` still
hides the input after typing a line and pressing enter even after this
change.
2020-11-30 17:08:04 +01:00
eugene yokota 2bbbcfae77
Merge pull request #6174 from hamnis/bsp_connection_file_possibly_disabled
Make it possible to not write the bsp connection file
2020-11-29 11:46:24 -05:00
Erlend Hamnaberg a554976ffb Update main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
Change from review

Co-authored-by: Adrien Piquerez <adrien.piquerez@gmail.com>
2020-11-29 16:36:38 +01:00
Ethan Atkins d167dee7d2 Add --sbt-launch-jar command line arg to client
The intellij bsp integration launches sbt with the launcher and runs
-bsp. This doesn't work if sbt is not on intellij's path. To try and
work around this, we can add an option --sbt-launch-jar that is
recognized by the network client and will make it use the launch jar
rather than the sbt script to launch a new server if needed.
2020-11-27 12:21:21 -08:00
Ethan Atkins b70bdce683 Set the exit value when sbt is started with -client 2020-11-27 12:12:15 -08:00
Erlend Hamnaberg 341e09a07e Make it possible to not write the bsp connection file
Made the bspConfig task dependendant on the bspConfig value.
Changed the bspConfig setting to use a attributeKey so we can use it in the server as well.
2020-11-27 20:00:12 +01:00
João Ferreira e1d8f0cafd
Updates to Coursier 2.0.7 (#6120)
* Updates to Coursier 2.0.7

https://github.com/coursier/sbt-coursier/releases/tag/v2.0.4 which includes https://github.com/coursier/coursier/releases/tag/v2.0.7

> Memo-ize classes that can be created at a high rate

coursier.core.{Dependency, Module, Publication} are now memo-ized (using weak references). This can lower the amount of duplicate instances of these objects, and lower GC pressure.
2020-11-26 19:25:37 -05:00
eugene yokota 29358529f9
Merge pull request #6171 from eatkins/ctrl-c-watch
Fix ctrl+c handling after exiting watch
2020-11-26 12:30:59 -05:00
Ethan Atkins 5c508e4275 Fix waitWatch failure handling
The waitWatch command is very similar to shell in that it should
override the onFailure command to be itself. It also enqueues itself to
remaining commands whenever it reads a new command which made it
unnecessary to append waitWatch to the runCommmand in Continuous.
2020-11-25 14:54:13 -08:00
Ethan Atkins 90ca463c70 Add signal registration in LineReader
It is possible for the signal handler to get in a state where it has no
effect in the shell. When this happens, entering ctrl+c does not exit
the shell. To ensure that ctrl+c always exits the shell, we can register
a signal handler in the line reader that write -1 to the terminal input
stream, which should cause the line reader to return an exit command.
2020-11-25 14:31:29 -08:00
Ethan Atkins c24e7da844 Rethrow InterruptedException instead of ClosedException
There are cases where sbt will incorrectly shutdown if the jline reader
is interrupted while filling the input buffer. To fix this we can throw
an InterruptedException instead of a ClosedException.

The repro for this was start `sbt`, input `~compile` and while sbt was
starting up, open a source file with vim using the metals bsp
integration. sbt server would end up shutting down everytime after a
single compilation iteration.
2020-11-25 14:31:29 -08:00
eugene yokota d46d5dfff5
Merge pull request #6168 from eatkins/ipcsocket-upgrade
Update ipcsocket
2020-11-25 11:49:15 -05:00
Ethan Atkins d5ddf0f8ce
Merge branch 'develop' into ipcsocket-upgrade 2020-11-25 08:25:11 -08:00
eugene yokota 1051690d61
Merge pull request #5515 from jtjeferreira/better_file_input
introduce a new Input/Output: FileInput/FileOutput
2020-11-25 11:11:04 -05:00
Ethan Atkins 3f3e219e0f Update ipcsocket
The new version provides an apple silicon arm64 jni implementation of
the ipcsocket api. It also adds a jni implementation for getting the max
socket length which is necessary because jna isn't supported on the
apple arm64 platform yet.
2020-11-25 07:34:11 -08:00
João Ferreira dd411cac9f introduce a new new Input/Output: FileInput/FileOutput
* FileInput avoids the intermediate String parsing of PlainInput
* FileOuput also avoid the intermediate String representation of PlainOutput
2020-11-25 14:04:56 +00:00
eugene yokota 2e248ca7c2
Merge pull request #6167 from eatkins/client-jni
Use jni if required when running client from xMain
2020-11-24 16:54:18 -05:00
Ethan Atkins 5769f80cbe Use jni if required when running client from xMain
See https://github.com/sbt/sbt/issues/6162#issuecomment-733207878.
2020-11-24 12:35:53 -08:00
Ethan Atkins 13b09bcd8f
Merge pull request #6166 from eatkins/watch-prompt-fix
Fix watch shell option
2020-11-23 14:46:42 -08:00
Ethan Atkins c6ab4d843e Fix watch shell option
When a user returns to the shell with 's' in recent versions of sbt, the
prompt is not initially displayed. This ends up being because MainLoop
was incorrectly setting the terminal prompt to Prompt.Watch when it
exited watch. I realized in debugging the issue that it didn't make
sense to restort the terminal prompt to the initial value before task
evaluation. By removing that logic, the 's' option option started
working correctly again.
2020-11-23 14:25:11 -08:00
eugene yokota 3a7ab8cf5e
Merge pull request #6165 from eatkins/ipcsocket-jna
Use JNI implementation of ipcsocket APIs on Arm Macs
2020-11-23 16:14:05 -05:00
Ethan Atkins ab2875e837 Use jni implementation of ipcsocket apis on arm macs
There isn't yet a version of the jna available that works with the new
apple silicon using arm64. To workaround this, we can use the jni
implementation by default on arm64 macs. If the user wants to force the
jni implementation for any supported platform, they can opt in with the
`sbt.ipcsocket.jni` system property and/or by setting the serverUseJni
setting.
2020-11-23 12:31:15 -08:00
Ethan Atkins 8e7e3efea1
Merge pull request #6164 from eatkins/thin-client-cancel
Make the thin client `cancel` command work reliably
2020-11-23 11:39:11 -08:00
Ethan Atkins fde8846b48
Merge branch 'develop' into thin-client-cancel 2020-11-23 10:19:24 -08:00
eugene yokota 098575feff
Merge pull request #6163 from eatkins/bump-sbt-version
Update sbt version
2020-11-23 13:16:19 -05:00
Ethan Atkins a9957e5d73 Make the thin client `cancel` command work reliably
When the sbt server is running a task, it presents all connected clients
with a message that instructs them that they cancel the running task.
Unfortunately, this often didn't work and the task would keep running
after cancel was entered. The reason for this was because the exec id
passed in to NetworkChannel did not necessarily match the exec id of the
running task. Because cancel in this case is not really exec specific,
this commit adds a flag to NetworkChannel.cancel that forces it to
cancel the running task regardless of what execID is passed in.
2020-11-23 10:05:47 -08:00
Ethan Atkins 4f0f5cec82 Update sbt version 2020-11-23 09:42:43 -08:00
Scala Steward 9a7f1bbd6f
Update scala-collection-compat to 2.3.0 (#296) 2020-11-23 10:20:38 +01:00
Scala Steward d58938ee54
Update sbt, scripted-plugin to 1.4.4 (#297) 2020-11-23 10:20:20 +01:00
eugene yokota f7507bde59
Merge pull request #345 from eed3si9n/wip/sbtn
sbtn 1.4.4
2020-11-22 20:32:24 -05:00
Eugene Yokota 44ba8e7dee sbtn 1.4.4 2020-11-22 20:19:16 -05:00
eugene yokota 909c5aa2c6
Merge pull request #6158 from eed3si9n/wip/pure-expression
Work around "a pure expression does nothing" warning, take 2
2020-11-22 17:35:01 -05:00
Eugene Yokota 00265bf912 Work around "a pure expression does nothing" warning, take 2
In https://github.com/sbt/sbt/pull/5981 I tried to work around the spruious post-macro "a pure expression does nothing" warning (https://github.com/scala/bug/issues/12112) by trying to remove some pure-looking expressions out of the tree.

This quickly backfired when it was reported that sbt 1.4.3 was not evaluating some code. This backs out the macro-level manipulation, and instead try to silence the warning at the reporter level. This feels safer, and it seems to work just as well.
2020-11-22 17:04:19 -05:00
Eugene Yokota 07f347b0f4 Revert "Strip out raw Ident(_) in blocks if it's synthetic"
This reverts commit a44aee9ac1.
2020-11-22 15:29:16 -05:00
Eugene Yokota 903a155faf Revert "setType to Block(...)"
This reverts commit b62ddaa4e9.
2020-11-22 15:28:59 -05:00
eugene yokota f9478a0231
Merge pull request #6155 from eed3si9n/wip/local_cache
Use `Global / localCacheDirectory` for remote caching
2020-11-22 15:10:49 -05:00