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

1212 Commits

Author SHA1 Message Date
eugene yokota 87d89a6ea6
Merge pull request #243 from eed3si9n/wip/merge-1.1.x 
Merge 1.1.x
 2018-06-14 02:52:03 -04:00
Eugene Yokota c0a0b7db0c Merge branch '1.1.x' into wip/merge-1.1.x 2018-06-14 01:42:01 -04:00
eugene yokota 69b9d61cbd
Merge pull request #239 from tanishiking/semver-selector 
Add semantic version selector API
 2018-06-14 01:22:29 -04:00
eugene yokota e8b6bdc15b
Merge pull request #235 from OlegYch/fix-sftp 
Fix sftp
 2018-05-27 19:37:09 -04:00
eugene yokota 7eb25984d5
Merge pull request #241 from tanishiking/enable-config-resource-with-gigahorse 
Enable sbt to specify -Dconfig.resource=/path/to/configFile without disabling gigahorse
 2018-05-17 07:48:54 +02:00
tanishiking24 c24ab5c4ee Enable sbt to specify config.resource without disabling gigahorse 
Fix https://github.com/sbt/sbt/issues/3585.
Gigahorse.config tries to load specified config file in sbt's classpath
and of course fail to find the specified config file, and throw
java.io.IOException if we specify config.resource, because

We can avoid trying to load specified config file inside sbt by
avoid using Gigahorse.config that call `ConfigFactory.load()` inside.

This commit fixes librarymanagement not to use Gigahorse.config and make
it use gigahorse.Config() which returns gigahorse's default config
without calling `ConfigFactory.load()` instead.
 2018-05-17 10:46:21 +09:00
eugene yokota 4106b37709
Merge pull request #240 from hodga/1.1.x 
Recover Resolving... log under UpdateLogging.Full
 2018-05-15 14:42:47 +02:00
Håkon Wold 9a002fb549 Fixes 4156 2018-05-15 13:22:38 +02:00
tanishiking24 d5f5cbb061 Rename VersionNumber#satisfies to VersionNumber#matchesSemVer 
VersionNumber#matchesSemVer receive SemanticSelector instead of String
 2018-05-12 12:28:03 +09:00
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
Dale Wijnand 10b6efc4c9
Merge pull request #237 from eed3si9n/wip/bump 
Scala 2.12.6 and other dependencies
 2018-04-30 11:10:15 +01:00
Eugene Yokota 3b6df7d105 Scala 2.12.6 and other dependencies 
sbt 1.1.4
Scala 2.12.6
ScalaCheck 1.14.0
ScalaTest 3.0.5
 2018-04-28 03:58:44 -04:00
OlegYch bbb2ef3977 fix retrieving deps via sftp resolver 2018-04-11 22:23:16 +03:00
eugene yokota c57a55d3e9
Merge pull request #236 from retronym/bump/houserules 
Upgrade to latest sbt-houserules
 2018-04-08 14:32:16 -04:00
Jason Zaugg 58bb203858 Upgrade to latest sbt-houserules 2018-04-08 14:36:41 +10:00
OlegYch 13807179ae windows compatibility (due to contraband) 2018-04-07 21:59:32 +03: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 070e71321a
Merge pull request #233 from eed3si9n/wip/bumpsbt 
1.1.5-SNAPSHOT
 2018-03-27 10:47:44 +01:00
Eugene Yokota a14b53da5b bump to 1.1.5-SNAPSHOT 2018-03-26 22:50:41 -04:00
Eugene Yokota e0eb46a99e sbt 1.1.2 2018-03-26 22:50:03 -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