Commit Graph

981 Commits

Author SHA1 Message Date
eugene yokota 87827eb0df Merge pull request #94 from eed3si9n/wip/bumpcontraband
Bump to latest Contraband
2017-07-15 13:16:36 -04:00
Eugene Yokota 8b5210f84d Bump to latest Contraband 2017-07-15 10:36:03 -04:00
eugene yokota 199dc51a99 Merge pull request #84 from scalacenter/remove-f0-f1-maybe
Remove unnecessary F0, F1 and Maybe
2017-07-14 13:05:31 -04:00
jvican 18a73db57d
Remove unnecessary F0, F1 and Maybe
`F0`, `F1` and `Maybe` have become useless since Java 8 introduced
`Supplier`, `Function` and `Optional` in the default Java 8 standard
library.

Therefore, they are not necessary anymore. This change is required to
change some Zinc's and sbt APIs. They are not widely used, so the
changes will be small.
2017-07-14 15:56:34 +02:00
Dale Wijnand fe7743878f Merge pull request #92 from eed3si9n/wip/layout
Fix casting error during initialization
2017-07-14 13:03:55 +01:00
Eugene Yokota 19b3e47972 Fix casting error during initialization
While running scripted, you see

```
ERROR StatusLogger Unable to create custom ContextSelector. Falling back to default.
 java.lang.ClassCastException: Cannot cast org.apache.logging.log4j.core.async.AsyncLoggerContextSelector to org.apache.logging.log4j.core.selector.ContextSelector
	at java.lang.Class.cast(Class.java:3369)
	at org.apache.logging.log4j.util.LoaderUtil.newCheckedInstanceOf(LoaderUtil.java:201)
	at org.apache.logging.log4j.util.LoaderUtil.newCheckedInstanceOfProperty(LoaderUtil.java:226)
	at org.apache.logging.log4j.core.impl.Log4jContextFactory.createContextSelector(Log4jContextFactory.java:97)
	at org.apache.logging.log4j.core.impl.Log4jContextFactory.<init>(Log4jContextFactory.java:58)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
	at java.lang.Class.newInstance(Class.java:442)
	at org.apache.logging.log4j.LogManager.<clinit>(LogManager.java:94)
	at org.apache.logging.log4j.spi.ThreadContextMapFactory.createThreadContextMap(ThreadContextMapFactory.java:73)
	at org.apache.logging.log4j.ThreadContext.init(ThreadContext.java:223)
	at org.apache.logging.log4j.ThreadContext.<clinit>(ThreadContext.java:202)
	at org.apache.logging.log4j.core.impl.ContextDataInjectorFactory.createDefaultInjector(ContextDataInjectorFactory.java:83)
	at org.apache.logging.log4j.core.impl.ContextDataInjectorFactory.createInjector(ContextDataInjectorFactory.java:67)
	at org.apache.logging.log4j.core.lookup.ContextMapLookup.<init>(ContextMapLookup.java:34)
	at org.apache.logging.log4j.core.lookup.Interpolator.<init>(Interpolator.java:117)
	at org.apache.logging.log4j.core.config.AbstractConfiguration.<init>(AbstractConfiguration.java:125)
	at org.apache.logging.log4j.core.config.DefaultConfiguration.<init>(DefaultConfiguration.java:46)
	at org.apache.logging.log4j.core.layout.PatternLayout$Builder.build(PatternLayout.java:650)
	at org.apache.logging.log4j.core.layout.PatternLayout.createDefaultLayout(PatternLayout.java:487)
	at sbt.internal.util.ConsoleAppender.<init>(ConsoleAppender.scala:245)
```

This aims to workaround the casting error during PatternLayout.createDefaultLayout()
that was originally used for ConsoleAppender.
The stacktrace shows it's having issue initializing default DefaultConfiguration.
Since we currently do not use Layout inside ConsoleAppender, the actual pattern is not relevant.
2017-07-14 07:39:05 -04:00
Dale Wijnand 88395e18a4 Merge pull request #89 from dwijnand/travis-ci
Add caching to .travis.yml
2017-07-10 09:58:35 +01:00
eugene yokota 655d54d7c3 Merge pull request #90 from dwijnand/bai
Remove modules that have moved back to sbt/sbt
2017-07-08 08:28:08 +02:00
Dale Wijnand 9d7f7bf0ec
Remove modules that have moved back to sbt/sbt 2017-07-07 14:41:32 +01:00
Dale Wijnand 927692223c
Add caching to .travis.yml 2017-07-07 12:06:08 +01:00
Dale Wijnand c76d2624f9
No need for util-collection on Scala 2.10 anymore
We still publish parts of sbt for Scala 2.10 for compiler-bridge reasons
in Zinc.  However util-collection is now becoming an sbt-only module, so
it won't need to continue to cross-build to Scala 2.10!  Its new
dependency util-position which is used by lm also isn't a dependency of
the compiler-bridge, so also doesn't need to be cross-built to Scala
2.10.
2017-07-06 13:30:15 +01:00
Dale Wijnand 8d0463e6e8
No sbt-doge in sbt 1, switch back to + 2017-07-06 13:25:05 +01:00
Dale Wijnand 2214f66f33 Merge pull request #86 from dwijnand/detangle
Detangle the dependencies, particularly collection.
2017-07-06 13:17:04 +01:00
Dale Wijnand 48d82f95c2
Breakout Position to drop lm->collection dep 2017-07-03 12:04:45 +01:00
Dale Wijnand 84180ec402
Move Showlines to logging to drop logging->collection dep 2017-07-03 12:04:45 +01:00
Dale Wijnand f8d67d6837
Move HListFormats to collection to drop cache->collection dep
Looks like the reason that util-cache depended on util-collection was to
define the sjson-new formats (HListFormats) for util-collection's HList.
Given that util-collection already depends on sjsonnew, HListFormats can
also be defined in util-collection.

All that was left then was (a) HListFormatSpec requires
sjsonnewScalaJson, so that was added in test scope, and (b) HListFormats
had to be dropped from sbt.util.CacheImplicits - HListFormats will have
to be imported and/or mixed-in where required downstream. For importing
convenience I defined a companion object.
2017-07-03 12:04:44 +01:00
eugene yokota e1c0e5c045 Merge pull request #88 from eed3si9n/wip/contrabandbump
Contraband 0.3.0-M7, and transitive ScalaJSON
2017-07-01 16:57:38 -04:00
Eugene Yokota b912a58125 Fix tests 2017-07-01 08:00:19 -04:00
Eugene Yokota 2d777a85ee clean up warnings 2017-07-01 07:47:39 -04:00
Eugene Yokota 4e01a35917 Contraband update 2017-07-01 07:47:19 -04:00
eugene yokota 8077ead3b3 Merge pull request #87 from eed3si9n/wip/bumpio
io 1.0.0-M12
2017-07-01 03:55:48 -04:00
Eugene Yokota 4ff793645d io 1.0.0-M12 2017-07-01 03:10:38 -04:00
Dale Wijnand a99a99ce43 Merge pull request #85 from eed3si9n/wip/crashlog
send TraceEvent on crash
2017-06-30 12:23:18 +01:00
Dale Wijnand bc059ad7bb Merge pull request #83 from dwijnand/no-eval
Get rid of Eval
2017-06-30 12:21:51 +01:00
Eugene Yokota 32d6bf38cf send TraceEvent on crash
Fixes sbt/sbt#3234
2017-06-28 02:18:03 -04:00
Dale Wijnand 03213f84c8
Get rid of Eval 2017-06-21 11:36:02 +01:00
Dale Wijnand 54cf4a43bb Merge pull request #81 from Rogach/1.0
Upgrade to jline 2.14.4
2017-06-16 14:13:42 +01:00
Dale Wijnand bed9ec8b59 Merge pull request #82 from eed3si9n/wip/sbt_bump
Bump to using sbt 1.0.0-M6
2017-06-14 11:15:52 +01:00
Eugene Yokota 244bf0f6e1 Bump to using sbt 1.0.0-M6 2017-06-14 01:39:49 -04:00
Rogach 44e64437b0 Upgrade to jline 2.14.4
A recent ncurses upgrade breaks older jlines.

https://github.com/sbt/sbt/issues/3240
2017-06-13 15:19:45 +03:00
Dale Wijnand 471ee7fdc4 Merge pull request #80 from eed3si9n/wip/logging2
Fixes buffered log appender
2017-05-18 06:48:55 +01:00
Eugene Yokota f2cc5ee775 convert log4j async LogEvent to an immutable one
This fixes the buffered log not showing up for tests.

Ref sbt/sbt#3198
2017-05-18 00:36:24 -04:00
Eugene Yokota feeb6291cd Add toString for ObjectEvent 2017-05-18 00:34:41 -04:00
Eugene Yokota 122c738913 bump version 2017-05-17 00:18:24 -04:00
eugene yokota ecf3dd3ae8 Merge pull request #78 from eed3si9n/wip/cached
Adds back overrides for File-based caching
2017-04-17 12:40:23 -04:00
Eugene Yokota f48848e5d4 Adds overrides for File-based caching
sbt/util#45 implemented caching using sjson-new. Now many of the functions take `CacheStore` that abstracts the caching ability.

sbt/sbt#3109 demonstrates that setting up CacheStore requires boilerplate involving concepts introduced in sbt 1.

This change adds back overrides using File by making assumption that majority of the time we would want standard JSON converter.
2017-04-17 10:24:54 -04:00
Eugene Yokota 061b259d1d Fix build 2017-04-04 23:56:54 -04:00
Eugene Yokota ed8034f12d Bump IO 2017-04-04 23:55:39 -04:00
eugene yokota e9e6939c8f Merge pull request #77 from eed3si9n/fport/2999
[fport] JLine 2.14.3
2017-04-04 16:23:59 -07:00
Eugene Yokota 70a2b4c169 JLine 2.14.3
Fixes sbt/sbt#1855
See also jline/jline2#127
2017-04-04 16:49:18 -04:00
eugene yokota e4489a3923 Merge pull request #76 from dwijnand/drop-out-X
Drop (out-X) from the log output
2017-04-04 09:52:51 -07:00
Dale Wijnand d088d16d78
Drop (out-X) from the log output
Fixes sbt/sbt#3056
2017-04-04 14:15:01 +01:00
Dale Wijnand add9bd2f4d Merge pull request #74 from eed3si9n/wip/json
Store JSON into ObjectEvent
2017-04-03 08:35:56 +01:00
Eugene Yokota 069104b989 Bump up log4j2 to 2.8.1 2017-04-03 03:22:47 -04:00
Eugene Yokota 1dab826ffd Store JValue into ObjectEvent 2017-04-03 03:22:33 -04:00
Eugene Yokota e21c78ebb0 Move JValue format here 2017-04-03 03:22:04 -04:00
Eugene Yokota 94a2e6cb12 Fix directory name 2017-04-03 03:21:14 -04:00
Eugene Yokota 66f345a303 Cross publish utilCollection
Fixes sbt/util#72
2017-04-03 03:20:36 -04:00
eugene yokota 6c768a1ca3 Merge pull request #73 from dwijnand/self-serialisable-attrkeys
Define OptJsonWriter & put it on AttributeKey
2017-03-21 16:05:48 -07:00
Dale Wijnand d91c3de736
Rename to StrictMode 2017-03-21 21:50:45 +00:00