Commit Graph

1494 Commits

Author SHA1 Message Date
Eugene Yokota 31db59c825 IO 1.6.0, Util 1.6.0 2021-12-26 01:08:49 -05:00
eugene yokota a52e34a2b0
Merge pull request #391 from peter-janssen/maven-repo-local-property
Respect maven.repo.local property
2021-12-23 10:53:18 -05:00
Peter Janssen f89ba48906 Respect maven.repo.local property 2021-12-23 16:38:52 +01:00
Eugene Yokota caf47ff5cd Util 1.6.0-RC1 2021-11-29 03:34:25 -05:00
eugene yokota cb41524fbe
Merge pull request #390 from eed3si9n/wip/configref
intern/flyweight ConfigRef
2021-11-21 02:41:05 -05:00
Eugene Yokota 129b43acd2 intern/flyweight ConfigRef
Fixes https://github.com/sbt/sbt/issues/6721

Problem
-------
ConfigRef is among the most created on heap.

Solution
--------
intern/flyweight it.
2021-11-20 19:39:18 -05:00
xuwei-k 3ca1898721 fix warning. prepare Scala 3 2021-11-17 12:19:45 +09:00
eugene yokota f4cd994ab4
Merge pull request #387 from eed3si9n/wip/bump
Bump modules
2021-09-19 15:44:56 -04:00
Eugene Yokota 028724ac23 Bump modules 2021-09-19 15:29:08 -04:00
eugene yokota 54c1ee53c6
Merge pull request #386 from rtyley/avoid-repeating-version-in-eviction-error
Avoid repeating versions in Eviction error message
2021-09-18 22:29:03 -04:00
Roberto Tyley 9786906eca Avoid repeating versions in Eviction error message
Rather than seeing an error like this, with the evicted version numbers
being repeated many times:

```
[error] 	* org.scala-lang.modules:scala-java8-compat_2.13:1.0.0 (early-semver) is selected over {0.9.0, 0.9.0, 0.9.0, 0.9.0, 0.9.1, 0.9.1, 0.9.1}
```

...I'd much rather see an error like this:

```
[error]         * org.scala-lang.modules:scala-java8-compat_2.13:1.0.0 (early-semver) is selected over {0.9.0, 0.9.1}
```
2021-09-17 18:12:13 +01:00
eugene yokota fb33493969
Merge pull request #385 from P3trur0/patch-1
typo fixed.
2021-08-15 17:04:54 -04:00
Ubaldo Pescatore f0aa5d312e
typo fixed. 2021-08-12 17:21:07 +02:00
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