Commit Graph

1194 Commits

Author SHA1 Message Date
tanishiking24 4e8b6dc7aa Use contraband for generating SemanticSelector instead of using case class. 2018-05-12 12:23:58 +09:00
tanishiking24 f8efdb1ac2 Make semantic selector honor semver ordering around pre-release tags.
- When major, minor, and patch are equal, a pre-release version has lower precedence than a normal version. Example: 1.0.0-alpha < 1.0.0.
- Precedence for two pre-release versions with the same major, minor, and patch version MUST be determined by comparing each <del>dot</del> hyphen separated identifier from left to right until a difference is found as follows
- identifiers consisting of only digits are compared numerically and identifiers with letters or hyphens are compared lexically in ASCII sort order.
- Numeric identifiers always have lower precedence than non-numeric identifiers.
- A larger set of pre-release fields has a higher precedence than a smaller set, if all of the preceding identifiers are equal.
- Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0.

https://semver.org/#spec-item-11
2018-05-11 02:15:43 +09:00
tanishiking24 c0c88eda9f Add semantic version number selector API.
This semantic version number selector API is based on
- https://draftin.com/documents/375100?token=rR30GmJJzi4l3BRlD-cHs8lcAcdDAXH4oTzqOWeL0CT0BNv3PZEx0g8pBkI13sQgYXTBqShZ0Ucsqek3Fn3d-aU
- https://docs.npmjs.com/misc/semver
2018-05-09 02:53:01 +09:00
eugene yokota 6e4ad6ebd4
Merge pull request #238 from xuwei-k/foldLeft
use foldLeft instead of /:
2018-05-03 14:07:02 -04:00
xuwei-k 4d3818f9f7 use foldLeft instead of /:
02776afa79/src/library/scala/collection/IterableOnce.scala (L465)
2018-05-03 23:03:44 +09:00
eugene yokota cf9311a2e3
Merge pull request #222 from dwijnand/cleanup/VersionNumber
Cleanup & tweak VersionNumber
2018-04-05 11:41:25 -04:00
Dale Wijnand f74ec06699
Change semantics to match previous semantics
We're unsure about SemVer's semantics around pre-releases, so for now we
just revert this refactoring to preserve the semantics it's always had.
2018-04-05 14:42:41 +01:00
Dale Wijnand 79e31a3e0f
Allow pre-release versions to be compatible with normal versions 2018-04-03 17:48:26 +01:00
eugene yokota f1051771c7
Merge pull request #234 from eed3si9n/wip/merge-1.1.x
merge 1.1.x
2018-03-27 14:25:50 -04:00
Eugene Yokota 1073513b49 Merge branch '1.1.x' into wip/merge-1.1.x 2018-03-27 06:19:28 -04:00
Dale Wijnand 0e3a9e6e61
Merge pull request #232 from eed3si9n/wip/contraband
bump contraband to 0.4.0
2018-03-23 14:16:55 +00:00
Eugene Yokota a29a12054a bump contraband to 0.4.0
Ref https://github.com/sbt/contraband/issues/119
2018-03-23 22:21:05 +09:00
eugene yokota de894dfb9f
Merge pull request #230 from eed3si9n/wip/1.1.4
bump util to 1.1.3
2018-03-23 18:38:02 +09:00
Eugene Yokota f3b06bc18e bump util to 1.1.3 2018-03-23 18:13:59 +09:00
Dale Wijnand 0f93849214
Cleanup & tweak VersionNumber 2018-03-20 09:38:54 +00:00
Dale Wijnand c6b2b626c8
Merge pull request #221 from dwijnand/cleanup/VersionNumberSpec
Cleanup VersionNumberSpec
2018-03-20 09:36:36 +00:00
Dale Wijnand 4b9eb388a2
In VersionNumberSpec switch to FreeSpec, add "assert" prefix 2018-03-19 19:47:55 +00:00
Dale Wijnand f159846376
In VersionNumberSpec pass VersionString explicitly 2018-03-19 14:58:08 +00:00
Dale Wijnand 6feacbd1ec
Merge pull request #211 from exoego/1.x-eviction-summary
Add EvictionWarningOptions.summary that tells the users to call "evicted"
2018-03-19 11:53:43 +00:00
eugene yokota 73bce6fa5a
Merge pull request #228 from eed3si9n/wip/managed-checksums2
Adds null check for 'sbt.managedChecksums' in ivySettings file
2018-03-18 17:45:29 +09:00
eugene yokota c7911b9062
Merge branch '1.x' into 1.x-eviction-summary 2018-03-18 17:15:46 +09:00
IanGabes 7770fa64e9 Adds null check for 'sbt.managedChecksums' in ivySettings file
Fixes #195
2018-03-18 17:06:51 +09:00
Dale Wijnand 5b585b7a58
Merge pull request #226 from dwijnand/rename-MakePomConfiguration
Rename to MakePomConfigurationExtra.scala to match
2018-03-15 17:01:48 +00:00
Dale Wijnand dee7390117
Rename to MakePomConfigurationExtra.scala to match
See for example CrossVersionExtra.scala
2018-03-15 14:57:50 +00:00
Dale Wijnand 63c9857aec
Merge pull request #223 from dwijnand/shush-repl
Silence noisy compile warnings in all REPLs
2018-03-15 12:59:59 +00:00
Dale Wijnand e48438fecc
Merge pull request #225 from dwijnand/travis
CI enforce publish artifacts package without failure
2018-03-15 12:53:27 +00:00
Dale Wijnand 862b0a773d
CI enforce publish artifacts package without failure 2018-03-15 12:33:32 +00:00
Dale Wijnand e6cffafdba
Wrap Travis CI build script 2018-03-15 12:32:25 +00:00
Dale Wijnand 3ed3099017
Sync Scala versions between Travis CI & sbt 2018-03-15 12:31:53 +00:00
Dale Wijnand a1999a9b90
Cleanup VersionNumberSpec 2018-03-15 01:47:30 +00:00
eugene yokota 077f66e4a4
Merge pull request #220 from cunei/fix-219
Renaming MakePomConfiguration.scala
2018-03-15 10:34:24 +09:00
Antonio Cunei e55362e4c2 Renaming MakePomConfiguration.scala
The regular file has a name collision with the contraband-generated
name. Fixes #219.
2018-03-15 02:26:55 +01:00
Dale Wijnand 140eed1a18
Silence noisy compile warnings in all REPLs 2018-03-14 16:59:09 +00:00
Dale Wijnand 512684f3e0
Merge pull request #217 from ryandbair/jsch
Bump to latest jsch to support stronger key exchange algorithms
2018-03-13 10:40:38 +00:00
eugene yokota 67d97fed25
Merge pull request #216 from dwijnand/sans-copy
Replace abstract protected[this] copy with abstract withX methods
2018-03-11 11:25:34 -04:00
Dale Wijnand 76d1f73333
Replace abstract protected[this] copy with abstract withX methods 2018-03-09 13:51:14 +00:00
Dale Wijnand 95544d5175
Make Configuration's copy private[this]
.. now that it doesn't need to share it with a parent type.
2018-03-09 13:51:14 +00:00
Dale Wijnand de360bb139
Add notes as to why Configuration isn't managed by Contraband 2018-03-09 13:51:13 +00:00
Dale Wijnand 8d49d5163c
Cleanup Configuration 2018-03-09 13:51:13 +00:00
Dale Wijnand 127b90ee43
Make MakePomConfiguration a Contraband type again
Requires a separate file because of https://github.com/sbt/contraband/pull/118.
2018-03-09 13:51:13 +00:00
Ryan Bair 14cc5ea626 Bump to latest jsch to support stronger key exchange algorithms 2018-03-09 08:43:41 -05:00
Dale Wijnand 866b0a1d3f
Upgrade to contraband 0.3.3 2018-03-09 12:54:15 +00:00
Dale Wijnand b969f7362c
Make *Extra & *Functions classes private[librarymanagement]
They were never meant to be public types: they're implementation detail.
2018-03-09 12:54:11 +00:00
Dale Wijnand 16553efb8e
Move lm-ivy MiMa issues to lm-ivy 2018-03-09 10:13:47 +00:00
Dale Wijnand 4c5e1b926b
Merge pull request #215 from dhs3000/patch-1
allow wildcards in groupId or artifactId
2018-03-06 13:49:58 +00:00
Dennis Hörsch 245997c84e
Added test for wildcards in org and name 2018-03-06 13:48:42 +00:00
Dennis Hoersch c9e4ace8de
allow wildcards in groupId or artifactId
According to https://maven.apache.org/pom.html#Exclusions (and https://maven.apache.org/docs/3.2.1/release-notes.html) wildcards are allowed in Maven POM's schema
2018-03-06 13:48:41 +00:00
Dale Wijnand 1a566d8750
Merge pull request #214 from staale/patch-1
Fix to issue #180 to handle null contentType
2018-02-28 10:56:49 +00:00
eugene yokota 367764686b
Merge pull request #213 from retronym/faster/misc
Cache the hashCode of Configuration
2018-02-28 03:44:15 -05:00
Ståle Undheim 42e23e54ff
Fix to issue #180 to handle null contentType
If the content type is null, the call for .toString on it will cause an NPE. This fixes this issue by wrapping the call in an Option, then mapping toString or falling back to null. getCharSetFromContentType handles null by returning ISO-8859-1
2018-02-24 00:25:34 +01:00