luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,481 Commits 23 Branches 324 Tags 106 MiB
Commit Graph

1481 Commits

Author SHA1 Message Date
eugene yokota 5ef0af2486
Merge pull request #384 from adpi2/fix-6585 
Fix Scala 3 binary version
 2021-07-08 23:25:39 -04:00
Adrien Piquerez 37234e35ba Fix Scala 3 binary version 
- for 3.0.1-bin-nonbootstrapped it should be 3
- for 3.0.1-SNAPSHOT it should be 3
 2021-07-08 13:14:16 +02:00
eugene yokota 40a2166318
Merge pull request #383 from eed3si9n/wip/conflict_warning 
Fix cross-Scala suffix conflict warning
 2021-07-05 12:37:47 -04:00
Eugene Yokota 0aa7d69ee6 Fix cross-Scala suffix conflict warning 
Fixes https://github.com/sbt/sbt/issues/6578

Problem
-------
The regex currently expects two segments like2.x or 3.x,
but Scala 3 uses _3 as the cross suffix, and it's not caught.

Solution
--------
Change the regex.
 2021-07-05 04:11:20 -04:00
eugene yokota 564119c404
Merge pull request #380 from peter-janssen/expand-allowed-repository-id-chars 
Expand allowed maven repository id characters to match maven
 2021-06-02 15:17:10 -04:00
Peter Janssen 976ff44037 Fix logic and added test 2021-06-01 11:24:02 +02:00
eugene yokota f4615462dd
Merge pull request #381 from mkurz/patch-1 
Scala 2.12.14 / 2.13.6
 2021-05-30 22:11:24 -04:00
Matthias Kurz 93b1d2ff92
Scala 2.12.14 / 2.13.6 2021-05-28 17:57:56 +02:00
Peter Janssen 3de165c1dd Expand allowed maven repository id characters to match maven 
see 5c45b3fe22/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (L84)
 2021-05-28 17:15:48 +02:00
eugene yokota 5b4458dfde
Merge pull request #379 from mkurz/fix_SonatypeReleasesRepository 
Use correct Sonatype releases repository
 2021-05-18 22:19:10 -04:00
Matthias Kurz 0cc4397bf9
Use correct Sonatype releases repository 2021-05-18 10:09:44 +02:00
eugene yokota 6996817bcd
Merge pull request #378 from eed3si9n/wip/6496-followup 
Propagate version number parsing fix
 2021-05-15 15:06:44 -04:00
Eugene Yokota ae9f17c8fc Permit dot in cross util version parsing 
Ref #377
 2021-05-15 14:55:23 -04:00
Eugene Yokota 0ce5142b17 Apply version number parsing fix 
Ref #377

Apply the dotted-prerelease tag to SemComparator
"A pre-release version MAY be denoted by appending a hyphen and a series of dot separated identifiers immediately following the patch version."
 2021-05-15 14:12:46 -04:00
eugene yokota af46c23d5b
Merge pull request #377 from Nirvikalpa108/fix-6496 
Fixes sbt/sbt#6496 - bug in version parser
 2021-05-14 20:48:26 -04:00
Amina Adewusi 6f87212b9f Fixes sbt/sbt#6496 - bug in version parser 
What is the problem?
sbt/sbt#6496 identifies a bug in the logic which assesses whether
different versions of the same transitive dependency are binary
compatible. If one of the transitive dependencies included a version
with a full-stop literal, it would be parsed incorrectly and an error
would be thrown to the user falsely saying that the dependencies are
binary incompatible.

What is the solution?
This PR fixes the regex used by the parser to include full-stop literals.

Is there anything else to be done?
It is worth us checking the rest of the codebase in case this bug might
exist in other parsers. The tests are super helpful for figuring out
which strings might break the current logic.
 2021-05-14 19:39:37 +01:00
eugene yokota 4c19b9cc7c
Merge pull request #376 from eed3si9n/wip/use1.5.1 
Use sbt 1.5.1
 2021-05-03 01:11:53 -04:00
Eugene Yokota 5269e12e67 Use sbt 1.5.1 2021-05-02 22:18:03 -04:00
eugene yokota a83f75c02e
Merge pull request #375 from eed3si9n/wip/bump 
IO 1.5.0, Util 1.5.0
 2021-04-03 21:40:12 -04:00
Eugene Yokota c43aea5e68 IO 1.5.0, Util 1.5.0 2021-04-03 21:28:51 -04:00
eugene yokota f2ed2224ff
Merge pull request #374 from adpi2/fix-6420 
Fix binary version of 3.0.1-RC1
 2021-03-30 14:17:57 -04:00
Adrien Piquerez c98e51418f Fix binary version of 3.0.1-RC1 2021-03-30 17:50:50 +02:00
eugene yokota 23b7d923af
Merge pull request #373 from eed3si9n/wip/6388-take2 
Fix binary Scala warning, take 2
 2021-03-22 02:46:10 -04:00
Eugene Yokota fe33ed19de Fix binary Scala warning, take 2 
Ref https://github.com/sbt/librarymanagement/pull/372
 2021-03-22 02:30:00 -04:00
eugene yokota beb45007dc
Merge pull request #372 from adpi2/fix-6388 
No binary scala warning if 3 and 2.13
 2021-03-18 10:45:01 -04:00
Adrien Piquerez fd9e1cd929 No binary scala warning if 3 and 2.13 2021-03-18 15:15:11 +01:00
eugene yokota 685eb71aa9
Merge pull request #371 from eed3si9n/wip/bintray_less 
Remove sbt-bintray
 2021-03-15 00:51:50 -04:00
Eugene Yokota 7f6bbafb9b Remove sbt-bintray 2021-03-14 23:57:13 -04:00
Eugene Yokota d39d6a6186 crossScalaVersions 2021-03-14 23:29:35 -04:00
eugene yokota b280c2b0b0
Merge pull request #369 from MasseGuillaume/credentials-toString-bug 
Dont quote realm if it's null in Credentials.toString
 2021-03-09 00:18:48 -05:00
Guillaume Massé 956e8483f5 Dont quote realm if it's null in Credentials.toString 2021-03-08 23:25:38 -05:00
eugene yokota 0028ecf058
Merge pull request #367 from MasseGuillaume/sbt-6362 
Fix sbt/sbt#6362
 2021-03-07 00:29:34 -05:00
Guillaume Massé 3132647ac1 Fix sbt/sbt#6362 2021-03-06 22:42:32 -05:00
eugene yokota ea20a1d0f4
Merge pull request #366 from eed3si9n/wip/assumed_version_scheme 
Implement assumedVersionScheme
 2021-02-21 13:54:48 -05:00
Eugene Yokota dc0b682d7e Implement assumedVersionScheme 
Ref https://github.com/sbt/sbt/issues/6302
Ref https://github.com/sbt/sbt/issues/6301

Apparently some users are interested in keeping the eviction warning
feature, so here's an option to bring guessing back.
 2021-02-21 04:49:36 -05:00
eugene yokota 70e7718353
Merge pull request #365 from eed3si9n/wip/rename 
Follow up on scala3doc rename
 2021-02-14 13:37:47 -05:00
Eugene Yokota 3a9b0303f8 Follow up on scala3doc rename 
Ref https://github.com/sbt/sbt/issues/6307
Ref https://github.com/lampepfl/dotty/pull/11289
 2021-02-14 13:21:53 -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 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