luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Contraband update

This commit is contained in:
Eugene Yokota 2017-07-01 07:47:19 -04:00
parent 8077ead3b3
commit 4e01a35917
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -83,7 +83,7 @@ lazy val utilCollection = (project in internalPath / "util-collection").
crossScalaVersions := Seq(scala210, scala211, scala212), crossScalaVersions := Seq(scala210, scala211, scala212),
Util.keywordsSettings, Util.keywordsSettings,
name := "Util Collection", name := "Util Collection",
libraryDependencies ++= Seq(sjsonnew) libraryDependencies ++= Seq(sjsonnew.value)
) )
lazy val utilApplyMacro = (project in internalPath / "util-appmacro"). lazy val utilApplyMacro = (project in internalPath / "util-appmacro").
@ -112,7 +112,7 @@ lazy val utilLogging = (project in internalPath / "util-logging").
commonSettings, commonSettings,
crossScalaVersions := Seq(scala210, scala211, scala212), crossScalaVersions := Seq(scala210, scala211, scala212),
name := "Util Logging", name := "Util Logging",
libraryDependencies ++= Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson, scalaReflect.value), libraryDependencies ++= Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value),
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := { tpe => contrabandFormatsForType in generateContrabands in Compile := { tpe =>
val old = (contrabandFormatsForType in generateContrabands in Compile).value val old = (contrabandFormatsForType in generateContrabands in Compile).value
@ -144,7 +144,7 @@ lazy val utilCache = (project in file("util-cache")).
settings( settings(
commonSettings, commonSettings,
name := "Util Cache", name := "Util Cache",
libraryDependencies ++= Seq(sjsonnewScalaJson, scalaReflect.value) libraryDependencies ++= Seq(sjsonnewScalaJson.value, scalaReflect.value)
). ).
configure(addSbtIO) configure(addSbtIO)

2
internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala
View File

@ -5,7 +5,7 @@ package util
import sbt.util.Level import sbt.util.Level
import sjsonnew.JsonFormat import sjsonnew.JsonFormat
import sjsonnew.support.scalajson.unsafe.Converter import sjsonnew.support.scalajson.unsafe.Converter
import scala.json.ast.unsafe.JValue import scalajson.ast.unsafe.JValue
final class ObjectEvent[A]( final class ObjectEvent[A](
val level: Level.Value, val level: Level.Value,

2
internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala
View File

@ -7,7 +7,7 @@ package internal
package util.codec package util.codec
import sjsonnew.{ JsonWriter => JW, JsonReader => JR, JsonFormat => JF, _ } import sjsonnew.{ JsonWriter => JW, JsonReader => JR, JsonFormat => JF, _ }
import scala.json.ast.unsafe._ import scalajson.ast.unsafe._
trait JValueFormats { self: sjsonnew.BasicJsonProtocol => trait JValueFormats { self: sjsonnew.BasicJsonProtocol =>
implicit val JNullFormat: JF[JNull.type] = new JF[JNull.type] { implicit val JNullFormat: JF[JNull.type] = new JF[JNull.type] {

6
project/Dependencies.scala
View File

@ -1,5 +1,6 @@
import sbt._ import sbt._
import Keys._ import Keys._
import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
val scala210 = "2.10.6" val scala210 = "2.10.6"
@ -43,9 +44,8 @@ object Dependencies {
val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
val sjsonnewVersion = "0.8.0-M1" val sjsonnew = Def.setting { "com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value }
val sjsonnew = "com.eed3si9n" %% "sjson-new-core" % sjsonnewVersion val sjsonnewScalaJson = Def.setting { "com.eed3si9n" %% "sjson-new-scalajson" % contrabandSjsonNewVersion.value }
val sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion
def log4jVersion = "2.8.1" def log4jVersion = "2.8.1"
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion

2
project/plugins.sbt
View File

@ -1,4 +1,4 @@
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M6") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M7")

2
util-cache/src/main/scala/sbt/util/CacheStore.scala
View File

@ -5,7 +5,7 @@ import sbt.io.syntax.fileToRichFile
import sbt.io.{ IO, Using } import sbt.io.{ IO, Using }
import sjsonnew.{ IsoString, JsonReader, JsonWriter, SupportConverter } import sjsonnew.{ IsoString, JsonReader, JsonWriter, SupportConverter }
import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser }
import scala.json.ast.unsafe.JValue import scalajson.ast.unsafe.JValue
/** A `CacheStore` is used by the caching infrastructure to persist cached information. */ /** A `CacheStore` is used by the caching infrastructure to persist cached information. */
abstract class CacheStore extends Input with Output { abstract class CacheStore extends Input with Output {