luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,444 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

1444 Commits

Author SHA1 Message Date
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 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 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 fe6825076c
Merge pull request #361 from adpi2/dotty-compat 
Add for3Use2_13 and for2_13Use3
 2021-01-08 13:20:46 -05:00
Adrien Piquerez 2b1806ae25 Add for3Use2_13 and for2_13Use3 2021-01-08 18:25:01 +01:00
eugene yokota 42aae724f8
Merge pull request #359 from adpi2/scala3doc 
Add scala3doc artifact
 2021-01-03 01:07:06 -05:00
eugene yokota 4fab9e0886
Merge pull request #360 from eed3si9n/wip/2.13 
Add Scala 2.13 support
 2021-01-03 01:06:01 -05:00
Eugene Yokota 5942ccbe1f Add Scala 2.13 support 2021-01-03 00:59:38 -05:00
Adrien Piquerez ec34dd71a3 Add scala3-tasty-inspector artifact 2020-12-30 15:01:08 +01:00
Adrien Piquerez 51d64c7eef Add scala3doc artifact 2020-12-29 16:42:20 +01: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 65b4130e6b
Update plugins.sbt 2020-12-21 13:47:50 +00: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 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 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
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 6c1926603f
Merge pull request #347 from 3rwww1/enhancement/update-ivy 
Ivy 2.3.0-sbt-fbc4f586aeeb1591710b14eb4f41b94880dcd745
 2020-11-22 14:22:07 -05:00
Erwan Queffélec 8b12c2bfa6 Update Ivy to the latest version 2020-11-22 09:41:25 +01:00
eugene yokota 4b06278db2
Merge pull request #346 from sbt/wip/nightly 
Use Bintray for nightly
 2020-11-15 02:36:02 -05:00
Eugene Yokota 349a4134e5 Use Bintray for nightly 2020-11-15 00:58:52 -05:00
Eugene Yokota f8f9ed0c67 Nightly setup 2020-11-14 19:46:04 -05:00
eugene yokota 3db3dff537
Merge pull request #345 from eed3si9n/wip/build2 
sbt-extras uses different environment variable name
 2020-11-09 14:37:20 -05:00
Eugene Yokota b7d4614f54 Use HOME 2020-11-09 14:30:11 -05:00
Eugene Yokota 796ab41db0 sbt-extras uses different environment variable name 2020-11-09 14:23:05 -05:00
eugene yokota c3fe13d658
Merge pull request #344 from eed3si9n/wip/build 
Migrate to GitHub Actions
 2020-11-08 23:05:25 -05:00
Eugene Yokota 7583ef5f77 Migrate to GitHub Actions 2020-11-08 19:04:16 -05:00
eugene yokota 46f36f7935
Merge pull request #343 from eed3si9n/wip/bogusbuild 
Preparatory GitHub Actions
 2020-11-08 18:53:06 -05:00
Eugene Yokota 388b4c20b5 Preparatory GitHub Actions 
This runs existing actions and then echoes hello
 2020-11-08 18:51:05 -05:00
eugene yokota 13b4bf4fdb
Merge pull request #342 from eed3si9n/wip/bumputil 
Upgrade to Util 1.4.0
 2020-10-04 12:52:23 -04:00
Eugene Yokota f63adb4a8a Util 1.4.0 2020-10-04 12:42:46 -04:00
eugene yokota 949e1a6196
Merge pull request #341 from izharahmd/retry-on-server-error 
Retry publish on all 5XX errors
 2020-09-29 10:33:33 -04:00
izharahmd 07e3815261 retry publish on all 5XX errors 2020-09-29 19:20:42 +05:30
Eugene Yokota 39090fa0d3 Formatting 2020-09-21 22:29:08 -04:00
eugene yokota 18d9348905
Merge pull request #340 from izharahmd/wip/ivy-publish-with-retry-backoff 
Retry with backoff while publishing
 2020-09-15 16:34:23 -04:00
izharahmd fa0f859552 retry with backoff while publishing 2020-09-15 20:32:38 +05:30
eugene yokota 1e870ce40b
Merge pull request #339 from eed3si9n/wip/versionscheme 
Automatic eviction warning
 2020-08-05 17:06:08 -04:00
Eugene Yokota 9d87715100 Automatic eviction warning 
This extracts info.versionScheme from POM and uses that to guide the
eviction report instead of taking a stab in the dark that all Scala
libraries are using pvp.
 2020-08-05 16:39:11 -04:00
eugene yokota 50ca3902c3
Merge pull request #337 from eed3si9n/wip/unc 
support UNC path
 2020-06-25 23:40:04 -04:00