Commit Graph

17940 Commits

Author SHA1 Message Date
Adrien Piquerez fbbde2619b Add scripted scala3-instance-loader 2020-12-23 21:20:59 +01:00
Adrien Piquerez 3c55c606df Add scripted scala3-example-project 2020-12-23 21:20:59 +01:00
Adrien Piquerez 3d863a59f8 Add scripted scala3-scala-home 2020-12-23 21:20:59 +01:00
Adrien Piquerez ccb63e9eaa Add scripted scala3-compiler-bridge-binary 2020-12-23 21:20:59 +01:00
Adrien Piquerez 28ad11b07f Add scripted scala3-auto-scala-library 2020-12-23 21:20:59 +01:00
Adrien Piquerez 4b91541a69 Fix MetaBuildLoader on local snapshot deps 2020-12-23 21:20:59 +01:00
Adrien Piquerez 2d75cbd3b9 Manage .tasty files in Scala 3 2020-12-23 21:20:59 +01:00
Adrien Piquerez 08b83d6b31 Fetch Scala 3 compiler bridge binary module
Contrary to Scala 2, Scala 3 compiler bridges are tied to the compiler
version. There is one compiler bridge foreach compiler version.
Scala compiler bridges are pure java so they are binary compatible with
all Scala version. Consequently, we can fetch the binary module directly
without using the ZincCompilerBridgeProvider.
2020-12-23 21:20:59 +01:00
Adrien Piquerez c9478529e6 Manage Scala 3 instances 2020-12-23 21:20:24 +01:00
eugene yokota 1b0c251a69
Merge pull request #6227 from eed3si9n/wip/bump_zinc
Zinc 1.5.0-M1
2020-12-23 15:13:42 -05:00
Eugene Yokota 45ebeb6d32 Adjust to new Contraband 2020-12-23 13:41:29 -05:00
Eugene Yokota adb23cde89 Zinc 1.5.0-M1 2020-12-23 13:41:15 -05:00
Scala Steward a9995ca977
Update scala-collection-compat to 2.3.2 (#302) 2020-12-23 19:18:23 +01:00
Scala Steward 7adfdd56f5
Update sbt, scripted-plugin to 1.4.5 (#301) 2020-12-23 19:18:14 +01:00
eugene yokota f9d8d8c45f
Merge pull request #6221 from eed3si9n/wip/eviction_error
Replace EvictionWarning with EvictionError
2020-12-23 13:03:30 -05:00
eugene yokota 6b15b17eb1
Merge pull request #6226 from er1c/bsp-debug-messages
Add bsp DebugSession messages
2020-12-23 10:40:57 -05:00
Eric Peters bc53ea45b2 Add bsp DebugSession messages 2020-12-22 14:16:49 -08:00
eugene yokota 7e1cc051f6
Merge pull request #6225 from jtjeferreira/feature/contraband_regen
regen contraband
2020-12-21 12:47:20 -05:00
eugene yokota d282f3cb1f
Merge pull request #358 from jtjeferreira/patch-1
Update sbt-contraband to 0.5.1
2020-12-21 12:47:03 -05:00
João Ferreira 997ce66a1a regen contraband 2020-12-21 17:43:24 +00:00
João Ferreira 08eaa9fb3b regen contraband 2020-12-21 17:21:54 +00:00
eugene yokota 5a7e41c681
Merge pull request #6222 from jtjeferreira/feature/contraband
update sbt-contraband to 0.5.1
2020-12-21 12:00:39 -05:00
João Ferreira 65b4130e6b
Update plugins.sbt 2020-12-21 13:47:50 +00:00
João Ferreira 4595faebd8 bump contraband 2020-12-21 13:41:32 +00:00
Eugene Yokota 1111ed09ad Replace EvictionWarning with EvictionError
Fixes https://github.com/sbt/sbt/issues/5976
Ref https://eed3si9n.com/enforcing-semver-with-sbt-strict-update

This removes the guess-based EvictionWarning, and runs EvictionError instead.
EvictionError uses the `ThisBuild / versionScheme` information supplied by the library authors in addition to `libraryDependencySchemes` that the build users could provide:

```scala
ThisBuild / libraryDependencySchemes += "com.example" %% "name" % "early-semver"
```

as the version scheme "early-semver", "semver-spec", "pvp", "strict", or "always" may be used.
Here's an example of `update` failure:

```
[error]  * org.typelevel:cats-effect_2.13:3.0.0-M4 (early-semver) is selected over {2.2.0, 2.0.0, 2.0.0, 2.2.0}
[error]      +- com.example:use2_2.13:0.1.0-SNAPSHOT               (depends on 3.0.0-M4)
[error]      +- org.http4s:http4s-core_2.13:0.21.11                (depends on 2.2.0)
[error]      +- io.chrisdavenport:vault_2.13:2.0.0                 (depends on 2.0.0)
[error]      +- io.chrisdavenport:unique_2.13:2.0.0                (depends on 2.0.0)
[error]      +- co.fs2:fs2-core_2.13:2.4.5                         (depends on 2.2.0)
[error]
[error]
[error] this can be overridden using libraryDependencySchemes or evictionErrorLevel
```

This catches the violation of cats-effect_2.13:3.0.0-M4 version scheme (early-semver) without user setting additional overrides. If the user wants to opt-out of this, the user can do so per module:

```scala
ThisBuild / libraryDependencySchemes += "org.typelevel" %% "cats-effect" % "always"
```

or globally as:

```
ThisBuild / evictionErrorLevel := Level.Info
```
2020-12-21 00:24:39 -05:00
Eugene Yokota 3c955abea6 Fix compiler bridge concurrency issue
Fixes https://github.com/sbt/sbt/issues/5785
2020-12-21 00:13:14 -05:00
eugene yokota 21fc19a193
Merge pull request #6220 from eed3si9n/wip/bump_dev
Zinc 1.4.4 + lm 1.5.0-M2 + launcher 1.1.6
2020-12-20 23:13:02 -05:00
Eugene Yokota f5d4a0779e lm 1.5.0-M2 2020-12-20 22:31:17 -05:00
Eugene Yokota 9a3d55b92e Zinc 1.4.4 2020-12-20 22:24:29 -05:00
Eugene Yokota 599ee61251 launcher 1.1.6 2020-12-20 22:23:35 -05:00
eugene yokota a1f577a591
Merge pull request #356 from eed3si9n/wip/eviction_error
EvictionError
2020-12-20 20:44:48 -05:00
Eugene Yokota 9297139f6a Implement EvictionError
Ref https://eed3si9n.com/enforcing-semver-with-sbt-strict-update

This adds EvictionError, a replacement for EvictionWarning.
The problem with the current eviction warning is that it has too many
false positives. Using the versionScheme information that could be
supplied by the library authors and/or the build users, this eliminates
the guessing work. At which point, we can fail the resolution.
2020-12-20 19:35:15 -05:00
Eugene Yokota aac1edb426 Add Strict and Always support 2020-12-20 19:34:03 -05:00
Eugene Yokota 5f2f6ac161 Fix Ivy parsing of versionScheme 2020-12-20 19:33:00 -05:00
eugene yokota 28a77a39df
Merge pull request #354 from eed3si9n/wip/pvp
Use evalPvp
2020-12-20 17:27:31 -05:00
Eugene Yokota dc0d873f7b Use evalPvp
Follow-up on https://github.com/sbt/librarymanagement/pull/352
2020-12-20 16:58:50 -05:00
eugene yokota 0cb9f37de5
Merge pull request #6218 from eed3si9n/wip/failfast_false
fail-fast: false
2020-12-19 18:18:37 -05:00
eugene yokota 7547f67294
Merge pull request #352 from eed3si9n/wip/match_error
Fixes match error when using withDottyCompat
2020-12-19 17:32:40 -05:00
Eugene Yokota 2308d0a3a7 Fixes match error when using withDottyCompat
Fixes https://github.com/sbt/sbt/issues/6210

scodec-bits is published with pvp versionScheme (nice), this means that
we should just evaluate the version portion for pvp-ness, but I was
using `guessSecondSegment` that checks for Scala suffix. That's mistake
1.

`guessSecondSegment` assumes that the Scala suffix uses the given
ScalaModuleInfo, but with 2.13-3 sandwich we can't assume this.
In the reported case, Scala module is 3.0.0-M3 but scodec-bits uses
2.13. So that's mistake 2.

This attempts to correct both the mistakes.
1. Instead of `guessSecondSegment`, this adds a simpler `evalPvp`
function.
2. `guessSecondSegment` just looks for `_2.` or `_3` and ignores the
Scala module.
2020-12-19 17:08:24 -05:00
Eugene Yokota f27722699b fail-fast: false 2020-12-19 15:20:10 -05:00
eugene yokota 26460f1c30
Merge pull request #6214 from eed3si9n/wip/completions
Fix tab completion perf regression
2020-12-19 07:49:57 -05:00
Eugene Yokota 76c4ae56f0 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 00:01:16 -05:00
eugene yokota 8a6c10327b
Merge pull request #6213 from eatkins/rejected-execution
Catch RejectedExecutionException in MainLoop
2020-12-18 20:28:26 -05:00
Ethan Atkins 0a8e8a45d0 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
2020-12-18 16:57:27 -08:00
eugene yokota 8e06d2315d
Merge pull request #351 from adpi2/sbt-dotty
Adapt ScalaOverride to Scala 3
2020-12-18 13:57:39 -05:00
Adrien Piquerez 24f85fd18c Adapt ScalaOverride to Scala 3 2020-12-18 17:28:47 +01:00
eugene yokota 0672da475d
Merge pull request #350 from adpi2/sbt-dotty
Add Scala 3 artifacts and binary versioning
2020-12-17 11:04:09 -05:00
eugene yokota 1dcafebb9c
Merge pull request #6207 from adpi2/scala3-libmanagement
Remove dotty tool dependencies
2020-12-17 11:03:09 -05:00
Adrien Piquerez f38a7272e7 Remove dotty tool dependencies 2020-12-17 10:24:07 +01:00
Adrien Piquerez 48b2a7a0a1 Add Scala 3 artifacts 2020-12-17 09:32:40 +01:00