From 34bcb706a0afba2dcb8153f4f8fea0cfbcf83952 Mon Sep 17 00:00:00 2001 From: Matt Hicks Date: Wed, 27 Jul 2016 08:35:28 -0500 Subject: [PATCH] Minor cleanup in build. --- project/HyperscalaBuild.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/HyperscalaBuild.scala b/project/HyperscalaBuild.scala index d6a0e6c..4490f82 100755 --- a/project/HyperscalaBuild.scala +++ b/project/HyperscalaBuild.scala @@ -5,7 +5,7 @@ import scoverage.ScoverageSbtPlugin.autoImport._ object HyperscalaBuild extends Build { lazy val root = project.in(file(".")) - .aggregate(baseJS, baseJVM, client, server, exampleJS, exampleJVM) + .aggregate(baseJS, baseJVM, coreJS, coreJVM, exampleJS, exampleJVM) .settings(sharedSettings()) .settings(publishArtifact := false) @@ -69,8 +69,8 @@ object HyperscalaBuild extends Build { ), coverageEnabled in Test := true ) - lazy val client = core.js.dependsOn(baseJS) - lazy val server = core.jvm.dependsOn(baseJVM) + lazy val coreJS = core.js.dependsOn(baseJS) + lazy val coreJVM = core.jvm.dependsOn(baseJVM) lazy val example = crossProject.crossType(HyperscalaCrossType).in(file("example")) .settings(sharedSettings(Some("example")): _*) @@ -88,8 +88,8 @@ object HyperscalaBuild extends Build { .jvmSettings( coverageEnabled in Test := true ) - lazy val exampleJS = example.js.dependsOn(client) - lazy val exampleJVM = example.jvm.dependsOn(server) + lazy val exampleJS = example.js.dependsOn(coreJS) + lazy val exampleJVM = example.jvm.dependsOn(coreJVM) private def sharedSettings(projectName: Option[String] = None) = Seq( name := s"${Details.name}${projectName.map(pn => s"-$pn").getOrElse("")}",