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

1174 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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 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
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 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
Jason Zaugg 4f2933d364 Cache the hashCode of Configuration 
I noticed this was showing up in profiles when SBT's task engine
was using Keys, etc (that contain Configurations) in HashMap's.

Let's cache it instead. I don't think there is a need to use a lazy
val for this, we can compute it eagerly.
 2018-02-23 14:58:00 +10:00
Dale Wijnand 69fb352fa1
Merge pull request #207 from dwijnand/versions 
Update version/mimaPreviousArtifacts/sbt.version
 2018-02-14 10:54:12 +00:00