Skip to content

Commit

Permalink
Remove offending plugin. Reorder project definition
Browse files Browse the repository at this point in the history
  • Loading branch information
ignasi35 committed Nov 22, 2019
1 parent 72e7dc8 commit 96e07d2
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ lazy val commonSettings = Def.settings(

lazy val root = project
.in(file("."))
.enablePlugins(PlayRootProject, ScalaJSPlugin, PlayNoPublish)
.enablePlugins(PlayRootProject, ScalaJSPlugin)
.aggregate(
`play-jsonJS`,
`play-jsonJVM`,
Expand Down Expand Up @@ -219,15 +219,7 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform)
)
.dependsOn(`play-functional`)

lazy val `play-json-joda` = project
.in(file("play-json-joda"))
.enablePlugins(PlayLibrary)
.settings(
commonSettings ++ playJsonMimaSettings ++ Seq(
libraryDependencies ++= joda ++ specsBuild.value.map(_ % Test)
)
)
.dependsOn(`play-jsonJVM`)
lazy val `play-jsonJS` = `play-json`.js

lazy val `play-jsonJVM` = `play-json`.jvm.settings(
libraryDependencies ++=
Expand All @@ -238,7 +230,15 @@ lazy val `play-jsonJVM` = `play-json`.jvm.settings(
unmanagedSourceDirectories in Test ++= (baseDirectory.value.getParentFile.getParentFile / "docs/manual/working/scalaGuide" ** "code").get
)

lazy val `play-jsonJS` = `play-json`.js
lazy val `play-json-joda` = project
.in(file("play-json-joda"))
.enablePlugins(PlayLibrary)
.settings(
commonSettings ++ playJsonMimaSettings ++ Seq(
libraryDependencies ++= joda ++ specsBuild.value.map(_ % Test)
)
)
.dependsOn(`play-jsonJVM`)

lazy val `play-functional` = crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Pure)
Expand Down

0 comments on commit 96e07d2

Please sign in to comment.