From e4c1a1c5594001452ee8e171c5fdf493b8b24ce6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 27 Jun 2017 01:58:38 -0400 Subject: [PATCH] Adjust to util bump --- .../sbt/internal/librarymanagement/formats/NodeSeqFormat.scala | 2 +- .../librarymanagement/formats/UpdateOptionsFormat.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/NodeSeqFormat.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/NodeSeqFormat.scala index fbc99e9b9..2a81aa37b 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/NodeSeqFormat.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/NodeSeqFormat.scala @@ -4,7 +4,7 @@ import sjsonnew._ import scala.xml._ trait NodeSeqFormat { self: BasicJsonProtocol => - implicit lazy val NodeSeqFormat: JsonFormat[NodeSeq] = project[NodeSeq, String]( + implicit lazy val NodeSeqFormat: JsonFormat[NodeSeq] = projectFormat[NodeSeq, String]( xml => { xml }.toString, str => XML.loadString(str).child ) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/UpdateOptionsFormat.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/UpdateOptionsFormat.scala index 147e53b80..c948a12c1 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/UpdateOptionsFormat.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/formats/UpdateOptionsFormat.scala @@ -18,7 +18,7 @@ trait UpdateOptionsFormat { self: BasicJsonProtocol with ModuleIDFormats with Re } implicit lazy val UpdateOptionsFormat: JsonFormat[UpdateOptions] = - project( + projectFormat( (uo: UpdateOptions) => ( uo.circularDependencyLevel.name,