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 74 MiB
Commit Graph

45 Commits

Author SHA1 Message Date
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 a29a12054a bump contraband to 0.4.0 
Ref https://github.com/sbt/contraband/issues/119
 2018-03-23 22:21:05 +09:00
Dale Wijnand dee7390117
Rename to MakePomConfigurationExtra.scala to match 
See for example CrossVersionExtra.scala
 2018-03-15 14:57:50 +00: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 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
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
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
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 68356306ec bump modules and plugins 2017-12-15 14:07:05 -05:00
Dale Wijnand 02c2ab5203 Use IO.getModified over importing the method 2017-12-15 14:06:16 -05:00
Antonio Cunei 41980634a4 Moved Milli._ to IO. 2017-12-15 14:06:16 -05:00
Antonio Cunei 340f1684c2 Temporary workaround to FileNotFoundException in RichUpdateReport() 2017-12-15 14:06:16 -05:00
Antonio Cunei ca2617e99e Convert lastModified/setLastModified calls to sbt.io.Milli calls (more precise) 2017-12-15 14:06:16 -05:00
Eugene Yokota 9c1566dfa1 Fix false positive on sbt 1.x module eviction warnings 
Fixes #187
 2017-11-29 20:02:37 -05:00
eugene yokota 50d024ac60
Merge pull request #183 from tpunder/fm-sbt-s3-resolver-conflict-fix 
Be friendly to SBT plugins that also use URLHandlerRegistry.setDefault
 2017-11-24 17:26:09 -05:00
xuwei-k a385a13fa5 fix incorrect eviction warning message 2017-11-02 15:10:05 +09:00
Alexey Alekhin 364ba9b44b Removed extra slash in the localBasePattern 
When the `scala_[scalaVersion]/` segment is present and the `/[branch]` segment isn't, an extra slash appears before `/[revision]`.
 2017-09-23 15:20:43 +02:00
Philippus Baalman d976980af2 Replace `ivys` and `artifacts` in comments 
The `ivys` and `artifacts` methods are not available anymore, now referring to `withPatterns`
 2017-09-04 15:46:39 +02:00
Peter Vlugter 437165eeb5 Include sbt plugin extra attributes in cached resolution 2017-08-16 11:27:26 +12:00
Dale Wijnand df108f7c78
Scalafmt 1.2.0 2017-08-14 15:29:06 +01:00
Dale Wijnand e91e5c9e77 Merge pull request #153 from dwijnand/UpdateReport.toString-2 
Make sure UpdateReport has a nice toString^2
 2017-08-10 16:41:34 +01:00
Dale Wijnand 63e63f05fa
Add back, re-configure & re-enable Scalafmt 2017-08-10 12:04:58 +01:00
Dale Wijnand f45a076241
Make sure UpdateReport has a nice toString^2 
Fixes sbt/sbt#3357
 2017-08-07 15:10:11 +01:00
Dale Wijnand c6e8bd72d2 Merge pull request #146 from dwijnand/UpdateReport.toString 
Make sure UpdateReport has a nice toString
 2017-07-28 10:36:35 +01:00
Dale Wijnand 52923854cc
Make sure UpdateReport has a nice toString 
Fixes sbt/sbt#3357
 2017-07-28 08:16:38 +01:00
Eugene Yokota d6e2720201 Let `ModuleDescriptor` declare cache inputs 2017-07-28 01:37:01 -04:00
Eugene Yokota 93c06d29b1 Implement better fake formats than ??? 
Fixes sbt/librarymanagement#67
Fixes sbt/sbt#3288
 2017-07-26 22:46:06 -04:00
Eugene Yokota 3db33720a9 Use IvyAuthenticator and JavaNetAuthenticator 
Fixes sbt/sbt#3331

The siatuation is a bit complicated.
Currently the credentials are stored in Ivy's credential store.
This needs to be translated into `java.net.Authenticator` by installing `IvyAuthenticator` and `ErrorMessageAuthenticator` in succession.
This, then, needs to be translated into OkHttp Authenticator using `okhttp3.JavaNetAuthenticator`.
 2017-07-24 05:16:42 -04:00
Eugene Yokota 26fa1c5f4b Fixes sbtApiVersion logic 
The NonRelease pattern matcher is ony checking for the third segment, but for sbt 1.x, we need to check both the second and third segment since 1.1.0-M1 would be bincompat with 1.0.

Fixes sbt/sbt#3360
 2017-07-23 02:34:36 -04:00
Dale Wijnand c5c20db754
Add Constant aliases to CrossVersion 2017-07-20 11:13:52 +01:00
Dale Wijnand c61a690109
Improve config-creating macro error message 
Fixes #130
 2017-07-17 14:23:00 +01:00
Eugene Yokota a09af23cc6 Builder pattern for MakePomConfiguration 2017-07-15 12:00:21 -04:00
Eugene Yokota 1d2f4d02cf Remove transitiveScratch 
This is used only by sbt, and we are not sure if it needs to be part of the API
 2017-07-15 11:19:14 -04:00
Eugene Yokota c95a885a3a Bump to latest Contraband 2017-07-15 11:17:23 -04:00
Eugene Yokota 0c28db9d21 rename to DependencyResolutionInterface 2017-07-15 11:17:23 -04:00
Eugene Yokota 358b750dde turn back syntax classes into traits 2017-07-15 11:17:23 -04:00
Eugene Yokota 7844190964 Use delegation instead of inheritance 2017-07-15 11:17:23 -04:00
Eugene Yokota a98c5f4c65 Minor cleanups per review 2017-07-15 11:17:23 -04:00
Eugene Yokota 7b22e78fd9 Library management API 
This splits the core of LM and Ivy-based implementation.

- InlineConfiguration is renamed to ModuleConfiguration
- IvyScala is renamed to ScalaModuleInfo
- UpdateConfiguration, RetrieveConfiguration, PublishConfiguration are refactored to use builder pattern.
- Adds ConfigRef for referencing Configuration
- Moves syntax related things into `sbt.librarymagement.syntax`
 2017-07-15 11:17:23 -04:00