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

1237 Commits

Author SHA1 Message Date
eugene yokota d70dc049f8
Merge pull request #256 from eed3si9n/wip/bump 
Util 1.2.0
 2018-07-29 20:47:12 -04:00
Eugene Yokota 5dd1e6adc3 Util 1.2.0 2018-07-29 20:34:40 -04:00
eugene yokota 3fcc9e3629
Merge pull request #255 from eed3si9n/wip/put 
Fixes destination file exists error message
 2018-07-29 15:01:23 -04:00
Eugene Yokota f353de243e Fixes destination file exists error message 
Fixes sbt/sbt#3431
Fixes sbt/sbt#4275

https://github.com/sbt/librarymanagement/pull/171 attempted to fix the error message previously, but it was not handling the common cases where the put is delegated to `super.put(...)`.
 2018-07-29 14:50:39 -04:00
eugene yokota 99e681225c
Merge pull request #253 from eed3si9n/wip/eviction-warning 
Default eviction warning to summary
 2018-07-01 02:21:09 -04:00
Eugene Yokota 22a4eed65f Default eviction warning to summary 2018-07-01 02:10:41 -04:00
eugene yokota 549a758cb6
Merge pull request #252 from sullis/cleanup-plugins.sbt 
cleanup plugins.sbt
 2018-06-28 17:44:18 -04:00
Sean Sullivan 127241f2c6 cleanup plugins.sbt 2018-06-28 05:59:58 -07:00
eugene yokota fe4ab536b4
Merge pull request #251 from eed3si9n/wip/merge-1.1.x 
Merge 1.1.x
 2018-06-26 19:31:33 -04:00
Eugene Yokota e97c79a243 IO 1.2.0-M2 2018-06-26 19:24:25 -04:00
Eugene Yokota 18380d5d4d Merge branch '1.1.x' into wip/merge-1.1.x 2018-06-26 19:22:54 -04:00
eugene yokota 70ff5ccef2
Merge pull request #249 from OlegYch/fix-perf 
fixes https://github.com/sbt/sbt/issues/4224
 2018-06-26 19:17:48 -04:00
eugene yokota 9c97be613f
Merge pull request #248 from khvatov/khvatov-patch-1 
Fix for #4157
 2018-06-26 00:44:05 -04:00
OlegYch a8d5db4fb6 fixes https://github.com/sbt/sbt/issues/4224 
blocking+global ec+par collections leads to a significant performance regression, offload downloading to a separate threadpool
 2018-06-26 00:28:34 +03:00
Alex Khvatov 660e6fb710
Fix for #4157 
see discussion https://github.com/sbt/sbt/issues/4157
 2018-06-19 14:47:48 -04:00
eugene yokota a500d0e0a3
Merge pull request #247 from eed3si9n/wip/bump 
IO, Util 1.2.0-M1
 2018-06-18 10:22:09 -04:00
Eugene Yokota 8e1e1e8121 IO, Util 1.2.0-M1 2018-06-18 04:46:51 -04:00
eugene yokota ff16f3b39e
Merge pull request #245 from eed3si9n/wip/offline 
Fix flaky OfflineModeSpec
 2018-06-18 04:46:03 -04:00
eugene yokota dee580bc0e
Merge pull request #246 from peterneyens/gigahorse-readtimeout 
Set Gigahorse readTimeout to 1 hour
 2018-06-17 03:25:08 -04:00
Peter Neyens 3b9385dfc5 Set Gigahorse readTimeout to 1 hour 2018-06-16 13:19:32 +01:00
Eugene Yokota 2b4aa3973d Fix flaky OfflineModeSpec 
Fixes https://github.com/sbt/librarymanagement/issues/229

OfflineModeSpec is failing often because it asserts that the offline resolution needs to happen within 30% of the original resolution, and I guess it really depends on the weather how much portion of it spends on resolution.
 2018-06-14 03:16:49 -04:00
eugene yokota b53a99b903
Merge pull request #244 from eed3si9n/wip/houserules 
sbt-houserules 0.3.7
 2018-06-14 02:56:19 -04:00
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 6b86d05ce6 sbt-houserules 0.3.7 2018-06-14 02:22:38 -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
Dale Wijnand f2f14582b1
Merge pull request #177 from eed3si9n/wip/npe_workaround 
Fix OkHttp JavaNetAuthenticator with null check
 2018-06-01 22:28:21 +01: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