Commit Graph

17422 Commits

Author SHA1 Message Date
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
Adrien Piquerez f1ede7cd06 Add Scala 3 binary versioning 2020-12-17 09:32:40 +01:00
Eugene Yokota 04eac0421b sbtn 1.4.5 2020-12-14 01:32:32 -05:00
eugene yokota acc94fd847
Merge pull request #6199 from adpi2/sbt-dotty
Add compiler-interface to the Scala Instance top loader
2020-12-11 13:32:06 -05:00
Adrien Piquerez c9ab2ee558 Put compiler-interface in the Scala Instance top loader 2020-12-11 11:47:08 +01:00
Scala Steward a7c6f77335
Update scala-collection-compat to 2.3.1 (#299) 2020-12-11 00:07:42 +01:00
Scala Steward d917a137ef
Update sbt-ci-release to 1.5.5 (#300) 2020-12-11 00:07:34 +01:00
eugene yokota 5d1c394bb4
Merge pull request #6190 from mkurz/fix_onLoad
onLoad now runs with correct FileTreeRepository and CacheStoreFactory
2020-12-03 21:28:34 -05:00
Matthias Kurz 0dc7622969
Use identity 2020-12-04 00:36:48 +01:00
Matthias Kurz 8e48630376
onLoad now runs with correct FileTreeRepository and CacheStoreFactory 2020-12-04 00:01:47 +01:00
eugene yokota 4d1af77701
Merge pull request #6189 from eatkins/jline-console-close
Close jline 3 terminal when console exits
2020-12-03 13:01:59 -05:00
Ethan Atkins 2e208af7c1 Close jline 3 terminal when console exits
The jline 3 Terminal is an autocloseable and should be closed when we're
down with it. I'm not exactly sure what resources we were potentially
leaking, but the jline3term variable is an instance of the jline
AbstractTerminal class which I know can create a thread in some
circumstances. This came up while working on #6185.
2020-12-03 08:30:14 -08:00
Eugene Yokota 7781c86aea Try shorter decoding 2020-12-02 21:26:41 -05:00
Eugene Yokota fba70c7af2 sbt-pgp 2.1.1 2020-12-02 20:29:50 -05:00
eugene yokota ed3d0bfea7
Merge pull request #43 from fthomas/patch-1
Add homepage setting to build
2020-12-02 10:07:12 -05:00
Frank S. Thomas d5505a752a
Remove comma
Co-authored-by: Anton Sviridov <keynmol@gmail.com>
2020-12-02 13:51:59 +01:00
Frank S. Thomas 82275d07ac
Add homepage setting to build
This enables Scala Steward to link to this page, the GitHub release notes
and version diff in its pull requests.
2020-12-02 13:02:02 +01:00
Eugene Yokota 9cf5d62edc Decode myself 2020-12-02 03:55:54 -05:00
Eugene Yokota cbd18b9d28 sbt-pgp 2.1.0-M1 2020-12-02 03:45:42 -05:00