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

1308 Commits

Author SHA1 Message Date
eugene yokota 0d9ff2b63e
Merge pull request #296 from eed3si9n/wip/jsonformats 
move CrossVersion to src/
 2019-04-02 12:32:52 -04:00
eugene yokota 505efdd187
Merge pull request #295 from eed3si9n/wip/sdkman 
use SDKMAN to install JDKs and sbt
 2019-04-02 12:31:07 -04:00
Eugene Yokota 2f8d9ad8ca move CrossVersion to src/ 
Fixes sbt/sbt#4595
Ref #290
Ref #280

This is bit of an odd one.

To keep bincompat and also to fix sbt 0.13 compatibility issue we have made `Disabled` companion object extend `Disabled` type.
This actually created a subtle deserialization issue:

```
[error] scala.MatchError: Disabled() (of class sbt.librarymanagement.Disabled$)
[error] 	at sjsonnew.FlatUnionFormats$$anon$5.write(FlatUnionFormats.scala:220)
[error] 	at sjsonnew.JsonWriter.addField(JsonFormat.scala:40)
[error] 	at sjsonnew.JsonWriter.addField$(JsonFormat.scala:37)
[error] 	at sjsonnew.FlatUnionFormats$$anon$5.addField(FlatUnionFormats.scala:208)
[error] 	at sjsonnew.Builder.addField(Builder.scala:43)
[error] 	at sbt.librarymanagement.ModuleIDFormats$$anon$1.write(ModuleIDFormats.scala:46)
```

This is because Contraband generates `flatUnionFormat5[CrossVersion, Disabled, ...]` for all of the subtypes of `CrossVersion`, which uses the runtime type information. Now that `Disabled` object is also in the mix, this created JSON that `CrossVersionFormats` cannot deserialize. This brings the code into src/ so we can write this part manually.
 2019-04-01 23:35:39 -04:00
Eugene Yokota 1c4f90e926 use SDKMAN to install sbt 2019-03-25 01:47:54 -04:00
Eugene Yokota 8219f3c117 use SDKMAN to install JDKs 2019-03-24 22:49:06 -04:00
eugene yokota f6c267a208
Merge pull request #292 from 0lejk4/make_developer_email_optional 
make Developer email optional as it is not obligatory and some people…
 2019-03-22 15:08:18 -04:00
eugene yokota 5e4a3a557a
Merge pull request #294 from eed3si9n/wip/bump 
bump IO and Util
 2019-03-22 15:04:47 -04:00
Eugene Yokota 5645e36ee1 Remove lmCoursier 
There's an implementation of lmCoursier in the coursier project itself, so this seems redundant here.
 2019-03-22 13:58:56 -04:00
Eugene Yokota 83a28b0b3d bump IO and Util 2019-03-22 13:53:17 -04:00
Eugene Yokota 7f19274304 sbt 1.2.8 2019-03-22 13:47:32 -04:00
0lejk4 a4e5a2e299 leave scheme unchanged for binary compatibility but don`t render email tag if it is null or empty 2019-03-17 11:32:52 +02:00
0lejk4 0878b9db14 make Developer email optional as it is not obligatory and some people don`t want to expose it 2019-03-14 00:10:26 +02:00
eugene yokota 6d35f329b6
Merge pull request #281 from eed3si9n/wip/adoptopenjdk 
use AdoptOpenJDK 1.8 and 11 for testing
 2019-01-23 19:40:24 -05:00
eugene yokota 82735ae983
Merge pull request #290 from eed3si9n/wip/disabled-bincompat 
make object Disabled extend Disabled
 2019-01-23 19:40:04 -05:00
eugene yokota 3edf839192
Merge pull request #288 from bigwheel/fix-287 
[Fix #287] Eviction warning summary shows only binary incompatible
 2019-01-23 15:25:45 -05:00
Eugene Yokota 75c319e6bb make object Disabled extend Disabled 
Ref https://github.com/sbt/librarymanagement/pull/280

This is to workaround bincompat error detected by sbt community build.

```
[cats] [error] java.lang.NoSuchMethodError: sbt.librarymanagement.CrossVersion$.Disabled()Lsbt/librarymanagement/Disabled$;
```
 2019-01-23 15:06:47 -05:00
bigwheel 8d4f6cee48 [Fix #287] Add alternative constructor for binary compatibility 2019-01-14 19:02:41 +09:00
bigwheel c1a93c65b7 [Fix #287] Eviction warning summary shows only binary incompatible 2019-01-10 22:24:11 +09:00
eugene yokota 96a3293c7d
Merge pull request #284 from eed3si9n/wip/bump2 
Bump Ivy
 2018-12-28 18:16:24 -05:00
Eugene Yokota e36ddd64ab Bump Ivy 
Ref https://github.com/sbt/ivy/pull/31
 2018-12-28 17:15:43 -05:00
Eugene Yokota d9409a3348 use AdoptOpenJDK 1.8 and 11 for testing 2018-11-27 00:57:47 -05:00
eugene yokota 91071253d9
Merge pull request #282 from eed3si9n/wip/mima-fix 
Mima fix from #280
 2018-11-27 00:53:58 -05:00
Eugene Yokota a18c343bdc Mima fix from #280 
Not sure how but #280 has slipped through with Mima failing.
 2018-11-27 00:26:07 -05:00
eugene yokota a01c43e075
Merge pull request #280 from dwijnand/fix-the-CrossVersion-compat 
Fix CrossVersion.Disabled compat
 2018-11-24 23:51:01 -05:00
Dale Wijnand ead0f82575
Fix CrossVersion.Disabled compat 2018-11-24 09:31:30 +00:00
eugene yokota 4a0a6c77bc
Merge pull request #278 from eed3si9n/wip/thread-pool 
Use fixed thread pool
 2018-11-06 17:32:59 -05:00
Eugene Yokota 29183f2fad Use fixed thread pool 
Fixes #274

In #249 parallel download switched to using its own thread pool.
It could potentially lead to unbounded download if nobody throttled.
This works around the issue by fixing the number of thread to 6, which is a common per-host max connection count.
 2018-11-01 02:27:19 -04:00
eugene yokota 92f8b75557
Merge pull request #277 from eed3si9n/wip/bump 
Bump IO and Util
 2018-10-29 15:16:39 -04:00
Eugene Yokota 08b8491c7f Bump IO and Util 2018-10-29 14:25:01 -04:00
eugene yokota 4b179e526d
Merge pull request #270 from andreaTP/coursierAgain 
Add Coursier as a  library management implementation
 2018-10-29 13:26:30 -04:00
Andrea Peruffo 11fdf8e31c adding multi-project test 2018-10-28 08:54:26 +00:00
andrea abc6d69271 compatibility with 2.12 2018-10-24 17:43:49 +01:00
andrea 1951da25bb rework again configurations management 2018-10-24 15:14:43 +01:00
andrea eeddaa3f5d cleaning up scripted test 2018-10-24 13:15:43 +01:00
andrea 33de2221f7 fixing tests 2018-10-24 12:18:16 +01:00
andrea 2e6870d17e minor cleanup and using missingOk instead of external property 2018-10-24 11:49:51 +01:00
Alexandre Archambault 3b7b2ffbb7 Tweak configuration handling 2018-10-24 11:29:05 +01:00
andrea a03f0ad437 Add ignore errors flag 2018-10-22 14:57:44 +01:00
andrea 5ceed97587 better attributes management and plugin resolution test disabled 2018-10-19 14:40:22 +01:00
andrea 572f87314f added hashing function 2018-10-19 12:05:40 +01:00
andrea 0499b58819 removed unused jsoncodec plugin 2018-10-19 10:55:20 +01:00
andrea 7d275cf18e targeting alex review 2018-10-19 10:50:27 +01:00
eugene yokota c53aa4a6df
Merge pull request #273 from eed3si9n/fport/collapse-eviction-warnings 
Collapse eviction warnings
 2018-10-18 15:06:45 -04:00
Dale Wijnand 0eadc6a6cb Drop trailing commas.. 2018-10-18 14:11:04 -04:00
Dale Wijnand 58bfe85f42 Collapse eviction warnings 
Rather than

    [warn] There may be incompatibilities among your library dependencies.
    [warn] Run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies.
    [warn] Run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies.
    [warn] Run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies.
    [warn] Run 'evicted' to see detailed eviction warnings

I would get:

    [warn] There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings
    [info] Done updating.
    [warn] There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings

which is a touch better. (IMO!)
 2018-10-18 14:10:59 -04:00
eugene yokota 910151d193
Merge pull request #271 from tanishiking/update-scaladoc-semantic-version-selector 
Update scaladoc for SemanticVersionSelector
 2018-10-16 15:13:49 -04:00
tanishiking 1d429e4c51 Update scaladoc for SemanticVersionSelector 
Fix for https://github.com/sbt/sbt/issues/4422
 2018-10-17 00:30:13 +09:00
andrea 1f46e3e32b fix 2018-10-16 12:35:23 +01:00
andrea d18c37974a going on, everything but sbt-plugins looks working 2018-10-16 12:31:07 +01:00
andrea 21e2c5f904 Starting point for going on 2018-10-15 18:20:36 +01:00