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

1161 Commits

Author SHA1 Message Date
OlegYch bbb2ef3977 fix retrieving deps via sftp resolver 2018-04-11 22:23:16 +03: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
Dale Wijnand bfe347cd22
Update version/mimaPreviousArtifacts/sbt.version 2018-02-14 10:46:24 +00:00
Dale Wijnand 2c6e38829f
Merge pull request #204 from OlegYch/fix-deadlock 
avoid deadlocks on spotty connections
 2018-01-18 16:29:07 +00:00
OlegYch d267b6fda5
clarify intent 2018-01-18 15:43:18 +00:00
OlegYch 86c59d8f72
avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738 2018-01-18 15:43:18 +00:00
Dale Wijnand 01bb0bd7dd
Merge pull request #199 from dwijnand/mima 
Add version 1.1.2 to mimaPreviousArtifacts
 2018-01-10 16:01:53 +00:00
Dale Wijnand aa26ae64b9
Add version 1.1.2 to mimaPreviousArtifacts 2018-01-10 15:42:42 +00:00
eugene yokota 203fce01eb
Merge pull request #192 from cunei/wip-milliBis 
Revert *ModifiedTime() calls to *lastModified*() calls
 2017-12-22 08:41:34 -05:00
Eugene Yokota fa472179f5 sbt 1.0.4 2017-12-22 08:35:26 -05:00
Eugene Yokota b53c37b54f IO 1.1.3 and Util 1.1.2 2017-12-22 08:35:11 -05:00
Antonio Cunei 72dd0064c3 Change modifiedTime definitions 2017-12-22 00:55:24 +01:00
Antonio Cunei 42f23e62aa Revert *ModifiedTime() calls to *lastModified*() calls 
There are just too many instances in which sbt's code relies on
the `lastModified`/`setLastModified` semantics, so instead of moving
to `get`/`setModifiedTime`, we use new IO calls that offer the new
timestamp precision, but retain the old semantics.
 2017-12-22 00:27:30 +01:00
eugene yokota badb96efb4
Merge pull request #194 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 14:36:17 -05:00