Commit Graph

10273 Commits

Author SHA1 Message Date
Eugene Yokota d0201557f0 adopt@1.8.0-275 2021-01-31 00:20:46 -05:00
Eugene Yokota 21a738b0fe Use sbt 1.3.13 dist 2021-01-30 23:57:08 -05:00
eugene yokota fede746922
Merge pull request #6288 from eed3si9n/bport/1.4.x
[1.4.x] Various backports
2021-01-30 13:33:39 -05:00
Sam Halliday 75311c6e57 nohup the server from GNU Emacs 2021-01-30 13:02:35 -05:00
Sam Halliday c1c04387d0 git ignore .bsp 2021-01-30 12:59:57 -05:00
Sam Halliday 192bca6a0a Terminal support for GNU Emacs 2021-01-30 12:59:51 -05:00
Eugene Yokota 416429f83e Deprecate externalPom
Ref #5493
2021-01-30 12:46:07 -05:00
Cyrille Chepelov e6282f5a71 bump lm-coursier-shaded to 2.0.6 (includes coursier 2.0.9) 2021-01-30 12:45:41 -05:00
Eugene Yokota 95148f12f5 Avoid the whitespace after completion 2021-01-30 12:45:15 -05:00
Ethan Atkins 63c9a1ae93 Catch RejectedExecutionException in MainLoop
sbt 1.4.x was printing a very verbose and annoying
RejectedExectionException when the user cancelled tasks with ctrl+c.

Fixes #6192
2021-01-30 12:43:36 -05:00
eugene yokota 3a658dda2a
Merge pull request #6231 from adpi2/1.4.x-fix-semanticdb
[1.4.x] Fix semanticdb on Scala > 3.0.0-M3
2020-12-25 17:32:12 -05:00
Adrien Piquerez 3ffb814abf Fix semanticdb on Scala > 3.0.0-M3 2020-12-25 17:33:12 +01:00
eugene yokota 1760a5ee4a
Merge pull request #6229 from eed3si9n/bport/6228
[1.4.x] lm-coursier 2.0.5
2020-12-24 03:13:41 -05:00
Eugene Yokota c9e7cfd2ed lm-coursier 2.0.5
Updates directories-jvm to 23
https://github.com/coursier/sbt-coursier/releases/tag/v2.0.5
https://github.com/coursier/coursier/releases/tag/v2.0.8
2020-12-24 00:20:52 -05:00
eugene yokota 2dca248ebb
Merge pull request #6219 from eed3si9n/wip/bump
[1.4.x] Zinc 1.4.4 + lm 1.4.3 + launcher 1.1.6
2020-12-20 23:12:44 -05:00
Eugene Yokota 870315a6e7 launcher 1.1.6 2020-12-20 22:15:56 -05:00
Eugene Yokota ac8e5d385f lm 1.4.3 2020-12-20 22:15:26 -05:00
Eugene Yokota 5fa1a8d789 Zinc 1.4.4 2020-12-20 22:14:16 -05:00
Eugene Yokota 35808eddd6 sbt 1.4.5 2020-12-20 22:13:06 -05:00
eugene yokota 23fee96b3c
Merge pull request #6216 from eed3si9n/bport/6214
[1.4.x] Fix tab completion perf regression
2020-12-19 15:59:26 -05:00
Eugene Yokota d1305647dc Update GitHub Actions configuration for 1.4.x branch 2020-12-19 15:16:50 -05:00
Eugene Yokota ce1eacb74f Revert "Set complete flag in completions"
This reverts commit edf43a473b.
This fixes performance regression of tab completion observerd in https://github.com/sbt/sbt/issues/6204
2020-12-19 13:49:56 -05:00
eugene yokota 160349e469
Merge pull request #6191 from mkurz/fix_onLoad_1.4.x
[1.4.x] onLoad now runs with correct FileTreeRepository and CacheStoreFactory
2020-12-03 21:30:05 -05:00
Matthias Kurz 07df9aa4c0
Use identity 2020-12-04 00:43:59 +01:00
Matthias Kurz 583ac69c15
onLoad now runs with correct FileTreeRepository and CacheStoreFactory 2020-12-04 00:43:59 +01:00
eugene yokota 75184cae67
Merge pull request #6184 from jtjeferreira/backport_coursier_2.0.7
[1.4.x] backport #6120 Updates to Coursier 2.0.7
2020-11-30 20:31:24 -05:00
João Ferreira 936a643c5b 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-30 21:08:52 +00:00
Ethan Atkins 1a1cca3cd3
Merge pull request #6170 from eatkins/1.4.x-6166-backport
[1.4.x] backport #6166 Fix watch shell option
2020-11-25 12:05:43 -08:00
Ethan Atkins 2bf6a8b0bf Merge pull request #6166 from eatkins/watch-prompt-fix
Fix watch shell option
2020-11-25 09:25:58 -08:00
eugene yokota 8a1f53d87b
Merge pull request #6169 from eatkins/1.4.x-arm64
[1.4.x] support apple silicon arm64 platform
2020-11-25 11:50:30 -05:00
Ethan Atkins bc8048ced4 Use jni if required when running client from xMain
See https://github.com/sbt/sbt/issues/6162#issuecomment-733207878.
2020-11-25 07:43:26 -08:00
Ethan Atkins 402067452d Evict io version of swoval file tree views
This version of swoval supports the apple arm64 platform.
2020-11-25 07:41:27 -08:00
eugene yokota 29f0989554 Merge pull request #6165 from eatkins/ipcsocket-jna
Use JNI implementation of ipcsocket APIs on Arm Macs
2020-11-25 07:37:22 -08:00
Ethan Atkins fef142e697 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:35:44 -08:00
eugene yokota 2cb0bc64a4
Merge pull request #6160 from eed3si9n/bport/pure-expression
[1.4.x] Work around "a pure expression does nothing" warning, take 2
2020-11-22 18:04:01 -05:00
Eugene Yokota 38c9698b99 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:36:41 -05:00
Eugene Yokota 17c032dd77 Revert "Strip out raw Ident(_) in blocks if it's synthetic"
This reverts commit a44aee9ac1.
2020-11-22 17:36:34 -05:00
Eugene Yokota 67fe0e0755 Revert "setType to Block(...)"
This reverts commit b62ddaa4e9.
2020-11-22 17:36:24 -05:00
eugene yokota 0c34137e37
Merge pull request #6159 from eed3si9n/wip/bump
[1.4.x] lm 1.4.1
2020-11-22 17:09:58 -05:00
Eugene Yokota 2419b0f38e lm 1.4.1 2020-11-22 16:23:40 -05:00
eugene yokota f1d8b68a83
Merge pull request #6157 from eed3si9n/bport/6155
[1.4.x] Use `Global / localCacheDirectory` for remote caching
2020-11-22 16:19:49 -05:00
Eugene Yokota caeb19bfc7 Use `Global / localCacheDirectory` for remote caching
Fixes https://github.com/sbt/sbt/issues/6102

https://github.com/sbt/sbt/pull/6026 changed the implementation of remote cache to NOT use dependency resolution (Coursier), and directly use Ivy resolver for efficiency. This was good, but when I made the change, I've changed the cache directory to be `crossTarget.value / "remote-cache"`. This was ok for local testing purpose, but not great for real usage since we don't want the cache to be wiped out either in the CI machines or on a local laptop.

This adds a new Global key called `localCacheDirectory`. Similar to Coursier cache, this is meant to be shared across all builds running on a machine. Also similar to Coursier cache this will try to follow the operating system specifc caching directory.

### localCacheDirectory location

- Environment variable: `SBT_LOCAL_CACHE`
- System property: `sbt.global.localcache`
- Windows: %LOCALAPPDATA%\sbt\v1
- macOS: $HOME/Library/Caches/sbt/v1
- Linux: $HOME/.cache/sbt/v1
2020-11-22 15:16:25 -05:00
eugene yokota 3aa083c8c5
Merge pull request #6152 from eatkins/1.4.x-backport-6151
[1.4.x] backport #6151 Only set scriptedBatchExcution true for >= 1.4
2020-11-21 13:41:26 -05:00
Ethan Atkins 5572d5ca56 Only set scriptedBatchExcution true for >= 1.4
In #6091, we updated the ScriptedPlugin to set scriptedBatchExecution :=
true for all 1.x versions but not 0.13. This commit further restricts
the setting so that it is only set for sbt >= 1.4, which seems necessary
based on the comments in #6094.
2020-11-21 08:44:10 -08:00
eugene yokota df6d79b521
Merge pull request #6150 from eatkins/1.4.x-backport-6146
[1.4.x] backport #6146 Prepend scala instance jars to sbt classpath
2020-11-21 11:37:10 -05:00
Ethan Atkins 6a9965c263 Prepend scala instance jars to sbt classpath
When using the launcher's classpath for the metabuild, the
scala-compiler jar can be missing. This is because the managedJars only
method returns the scala-library jar and not the rest of the scala
instance. To fix this, we can always prepend the scala instance jars to
the classpath.

In order to simulate the issue in scripted, I had to manually remove the
scala-compiler.jar from the scripted classpath or else the scripted test
that I added doesn't actually do anything because the scala-compiler.jar
would end up on the app.provider.mainClasspath.

Fixes #4452
2020-11-21 08:10:16 -08:00
eugene yokota da30c65aec
Merge pull request #6148 from adpi2/1.4.x
Bump semanticdb version to 4.4.0
2020-11-21 09:52:52 -05:00
Adrien Piquerez fc232abb58 Bump semanticdb version 2020-11-21 09:52:54 +01:00
eugene yokota c020e0d4f6
Merge pull request #6147 from eatkins/1.4.x-backport-6145
[1.4.x] backport #6145 Print empty newlines with progress
2020-11-20 23:16:16 -05:00
Ethan Atkins 5fe89944bd Print empty newlines with progress
With the latest sbt code, the `last` command displayed all of the output
without line separators. This occurred because the logic for appending
bytes to System.out split the input bytes on the line separator but if
there was nothing but the line separator in the input bytes then the
result was empty.
2020-11-20 13:09:23 -08:00