Commit Graph

17422 Commits

Author SHA1 Message Date
eugene yokota 43409fcc6f
Update main/src/main/scala/sbt/Defaults.scala 2021-01-24 18:02:50 -05:00
eugene yokota 01b5cb1bf4
Merge pull request #6283 from eed3si9n/wip/tab_completion
Fix configuration identifier completion
2021-01-24 12:32:20 -05:00
eugene yokota 99641bb552
Merge pull request #364 from eed3si9n/wip/cross
Make ModuleID#cross(...) preserve existing prefix
2021-01-24 11:33:17 -05:00
Eugene Yokota c5d65fe3c7 Cache configuration parser 2021-01-23 22:27:25 -05:00
Eugene Yokota 5deb1f5994 Fix configuration identifier completion
Fixes https://github.com/sbt/sbt/issues/6282
2021-01-23 22:15:06 -05:00
Eugene Yokota 12d46e3fce Make ModuleID#cross(...) preserve existing prefix
Fixes https://github.com/sbt/sbt/issues/6280

sbt-platform-deps implements `%%%` operator in https://github.com/portable-scala/sbt-platform-deps/blob/v1.0.0/src/main/scala/org/portablescala/sbtplatformdeps/PlatformDepsBuilders.scala#L36-L43
by setting the prefix field on `sbt.librarymanagement.Binary(...)`.
Currently `.cross(...)` would wipe this out, so `%%%` and `cross(CrossVersion.for3Use2_13)` do not compose.

This changes the implementation of `.cross(...)` so it can be chained
together and it will try to preserve the prefix (and suffix) values from
the existing `crossVersion` values.
This should fix the 2.13-3.x sandwich on Scala.JS and Scala Native.
2021-01-23 15:47:33 -05:00
eugene yokota 151c170409
Merge pull request #6278 from cchepelov/fix/adopt-coursier-2.0.9
bump lm-coursier-shaded to 2.0.6 (includes coursier 2.0.9)
2021-01-22 14:04:18 -05:00
Cyrille Chepelov 2fdc6a6212 bump lm-coursier-shaded to 2.0.6 (includes coursier 2.0.9) 2021-01-22 17:13:42 +01:00
Scala Steward 6dd53e0e3d
Update utest to 0.7.6 (#309) 2021-01-22 14:27:30 +01:00
Scala Steward 0060b8e921
Update coursier to 2.0.9 (#308) 2021-01-22 14:27:18 +01:00
eugene yokota cc87ae2635
Merge pull request #6276 from fommil/emacs
GNU Emacs support for sbtn and sbt --client
2021-01-21 16:38:39 -05:00
Sam Halliday 88baafa034 nohup the server from GNU Emacs 2021-01-21 10:51:00 +00:00
Sam Halliday bb8b097f5a git ignore .bsp 2021-01-21 10:50:57 +00:00
Sam Halliday 816208f081 Terminal support for GNU Emacs 2021-01-21 10:50:57 +00:00
eugene yokota c0e8267756
Merge pull request #6266 from melezov/fix-exitcode-calc
Fix ExitCode calc on StashOnFailure
2021-01-19 10:10:41 -05:00
Marko Elezovic 79645dfee7 Fix ExitCode calc on StashOnFailure
Previous sbt.Exec != String match would never fail
2021-01-19 11:37:00 +01:00
Adrien Piquerez 67689e0bbd Improve error report for scala3doc missing 2021-01-18 20:20:03 +01:00
eugene yokota 600942303f
Merge pull request #6263 from eed3si9n/wip/bump
IO 1.5.0-M1, LM 1.5.0-M4, Zinc 1.5.0-M3
2021-01-18 00:22:46 -05:00
Eugene Yokota d177b54967 IO 1.5.0-M1, LM 1.5.0-M4, Zinc 1.5.0-M3 2021-01-18 00:00:45 -05:00
eugene yokota b05971f941
Merge pull request #347 from flomebul/patch-1
Update sbt for cygwin environment support
2021-01-17 15:05:27 -05:00
Luc Henninger 4c9b315831
Update sbt for cygwin environment support
See issue #6260
2021-01-17 19:18:09 +01:00
Eugene Yokota 7b45fc594f Contraband files 2021-01-17 06:00:12 -05:00
eugene yokota 19a9c61024
Merge pull request #363 from eed3si9n/wip/bump_scala
Update to Scala 2.12.13 + 2.13.4
2021-01-17 05:53:58 -05:00
Eugene Yokota 417a30f8db Update to Scala 2.12.13 + 2.13.4 2021-01-17 04:18:49 -05:00
eugene yokota 4b71de0098
Merge pull request #6248 from adpi2/bsp-launch-jar
Add --sbt-launch-jar in bsp connection details
2021-01-16 13:00:46 -05:00
eugene yokota 932deaeb6f
Merge pull request #6259 from eed3si9n/wip/hedgehog
hedgehog-sbt 0.6.1
2021-01-16 11:24:37 -05:00
eugene yokota 5c24c0ecab
Merge branch 'develop' into bsp-launch-jar 2021-01-16 09:34:03 -05:00
Eugene Yokota 98450fe743 Add half-failing tests for completions 2021-01-16 03:48:57 -05:00
Eugene Yokota e86a705b4f hedgehog-sbt 0.6.1 2021-01-16 03:48:06 -05:00
eugene yokota e441595f59
Merge pull request #6258 from eed3si9n/wip/specs
Port mutable.Specification to verify.BasicTestSuite
2021-01-16 01:44:02 -05:00
eugene yokota b7c6ebd25c
Merge pull request #6257 from eed3si9n/wip/tab_completion
Avoid the whitespace after completion
2021-01-16 00:48:10 -05:00
Eugene Yokota 1c6a5d21bb Port mutable.Specification to verify.BasicTestSuite 2021-01-16 00:47:53 -05:00
Eugene Yokota 58dfca6e27 Avoid the whitespace after completion 2021-01-15 16:43:19 -05:00
eugene yokota 508a4b4bb9
Merge pull request #6254 from takezoe/jar-reset-time
Reset ZipEntry timestamps to 2010-01-01 to prevent negative value
2021-01-14 11:59:56 -05:00
Naoki Takezoe 5ce3a174e8 Reset ZipEntry timestamps to 2010-01-01 in order to prevent negative value 2021-01-14 08:32:50 +09:00
Adrien Piquerez f4d181de22 Add --sb-launch-jar in bsp connection details 2021-01-11 14:38:02 +01:00
Adrien Piquerez 844deab78c
Merge pull request #6177 from eatkins/client-launch-jar
Add --sbt-launch-jar command line arg to client
2021-01-11 14:35:40 +01:00
Scala Steward 2ed7ed3d9d
Update librarymanagement-ivy to 1.4.3 (#303) 2021-01-11 14:29:17 +01:00
Scala Steward a7f7a8eb31
Update sbt, scripted-plugin to 1.4.6 (#306) 2021-01-11 14:29:02 +01:00
Adrien Piquerez fdcfe87dbf
Merge branch 'develop' into client-launch-jar 2021-01-11 13:20:49 +01:00
eugene yokota c4c88b75e4
Merge pull request #6247 from eed3si9n/wip/2.13
Cross build to Scala 2.13
2021-01-10 21:03:44 -05:00
Eugene Yokota 8f5759e48d Cross build to Scala 2.13 2021-01-10 20:24:05 -05:00
Alexandre Archambault 88e73e260f Revert "Run release for 2.13.3"
This reverts commit 62c92c6b76.
2021-01-11 00:07:34 +01:00
Eugene Yokota f8c158291d Work around Scala parallel collections situation
Ref https://github.com/scala/scala-parallel-collections/issues/22

Parallel collection got split off without source-compatible library, so apparently we need to roll our own compat hack, which causes import not used, so it needs to be paired with silencer.
2021-01-10 18:02:18 -05:00
eugene yokota cb4c1e7100
Merge pull request #6246 from eed3si9n/wip/2.13-pre1
Port XMainConfiguration to Java
2021-01-10 16:08:02 -05:00
Alexandre Archambault 62c92c6b76 Run release for 2.13.3 2021-01-10 22:06:14 +01:00
eugene yokota 07278af003
Scala 2.13 support (#307) 2021-01-10 22:02:04 +01:00
Eugene Yokota 2f392ac264 don't enable SemanticDB on CI
Don't enable SemanticDB on CI for now since it doesn't support 2.10.
2021-01-10 15:26:26 -05:00
Eugene Yokota a6d03c819c Backtick the unicode letters in method 2021-01-10 14:21:50 -05:00
Eugene Yokota ab402543d3 Replace the unicode arrows 2021-01-10 14:20:43 -05:00