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

Remove formats already present upstream in sjson-new

This commit is contained in:
Dale Wijnand 2016-11-25 21:24:39 +00:00
parent ab08e1a9d5
commit ab9165ab04
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala
View File

@ -5,25 +5,7 @@ import sbt.internal.util.Types.:+:
import sjsonnew.{ Builder, deserializationError, JsonFormat, Unbuilder }
import sjsonnew.BasicJsonProtocol, BasicJsonProtocol.asSingleton
import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream }
import java.net.{ URI, URL }
trait URIFormat { self: BasicJsonProtocol =>
implicit def URIFormat: JsonFormat[URI] = project(_.toString, new URI(_: String))
}
trait URLFormat { self: BasicJsonProtocol =>
implicit def URLFormat: JsonFormat[URL] = project(_.toString, new URL(_: String))
}
trait FileFormat { self: BasicJsonProtocol =>
implicit def FileFormat: JsonFormat[File] = project(_.toString, new File(_: String))
}
trait SetFormat { self: BasicJsonProtocol =>
implicit def SetFormat[T: JsonFormat]: JsonFormat[Set[T]] = project(_.toSeq, (_: Seq[T]).toSet)
}
import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream }
trait HListFormat {
implicit def HConsFormat[H: JsonFormat, T <: HList: JsonFormat]: JsonFormat[H :+: T] =

3
internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala
View File

@ -4,8 +4,5 @@ import sjsonnew.BasicJsonProtocol
object CacheImplicits extends BasicCacheImplicits
with BasicJsonProtocol
with FileFormat
with HListFormat
with URIFormat
with URLFormat
with StreamFormat