diff options
-rw-r--r-- | scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala | 9 | ||||
-rw-r--r-- | scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala index 47bc9b23..a8981564 100644 --- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala +++ b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala @@ -93,7 +93,7 @@ object Subproject{ val flattened = deps.map{ case ScalaDep.Java(dep) => dep case ScalaDep.Scala(dep) => dep.copy(module = dep.module.copy(name = dep.module.name + "_" + scalaBinaryVersion)) - case ScalaDep.PointScala(dep) => dep.copy(module = dep.module.copy(name = dep.module.name + "_" + scalaVersion)) + case ScalaDep.Point(dep) => dep.copy(module = dep.module.copy(name = dep.module.name + "_" + scalaVersion)) }.toSet val start = Resolution(flattened) @@ -117,13 +117,14 @@ object Subproject{ object ScalaDep{ case class Java(dep: coursier.Dependency) extends ScalaDep implicit def default(dep: coursier.Dependency): ScalaDep = new Java(dep) + def apply(dep: coursier.Dependency) = Scala(dep) case class Scala(dep: coursier.Dependency) extends ScalaDep - case class PointScala(dep: coursier.Dependency) extends ScalaDep + case class Point(dep: coursier.Dependency) extends ScalaDep implicit def formatter: Format[ScalaDep] = new Format[ScalaDep]{ def writes(o: ScalaDep) = o match{ case Java(dep) => Json.obj("Java" -> Json.toJson(dep)) case Scala(dep) => Json.obj("Scala" -> Json.toJson(dep)) - case PointScala(dep) => Json.obj("PointScala" -> Json.toJson(dep)) + case Point(dep) => Json.obj("PointScala" -> Json.toJson(dep)) } def reads(json: JsValue) = json match{ @@ -131,7 +132,7 @@ object Subproject{ obj.fields match{ case Seq(("Java", dep)) => Json.fromJson[coursier.Dependency](dep).map(Java) case Seq(("Scala", dep)) => Json.fromJson[coursier.Dependency](dep).map(Scala) - case Seq(("PointScala", dep)) => Json.fromJson[coursier.Dependency](dep).map(PointScala) + case Seq(("PointScala", dep)) => Json.fromJson[coursier.Dependency](dep).map(Point) case _ => JsError("Invalid JSON object to parse ScalaDep") } diff --git a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala index 285d4171..217282a3 100644 --- a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala +++ b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala @@ -18,11 +18,11 @@ object MetacircularTests extends TestSuite{ override def ivyDeps = T{ super.ivyDeps() ++ Seq[ScalaDep]( - ScalaDep.Scala(Dep(Mod("com.lihaoyi", "sourcecode"), "0.1.4")), - ScalaDep.Scala(Dep(Mod("com.lihaoyi", "pprint"), "0.5.3")), - ScalaDep.PointScala(Dep(Mod("com.lihaoyi", "ammonite"), "1.0.3")), - ScalaDep.Scala(Dep(Mod("com.typesafe.play", "play-json"), "2.6.6")), - ScalaDep.Scala(Dep(Mod("org.scala-sbt", "zinc"), "1.0.3")) + ScalaDep(Dep(Mod("com.lihaoyi", "sourcecode"), "0.1.4")), + ScalaDep(Dep(Mod("com.lihaoyi", "pprint"), "0.5.3")), + ScalaDep.Point(Dep(Mod("com.lihaoyi", "ammonite"), "1.0.3")), + ScalaDep(Dep(Mod("com.typesafe.play", "play-json"), "2.6.6")), + ScalaDep(Dep(Mod("org.scala-sbt", "zinc"), "1.0.3")) ) } |