Skip to content

Commit

Permalink
Review comments and clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed May 25, 2020
1 parent 50c1eae commit 730c36d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
6 changes: 1 addition & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ lazy val commonSettings = Def.settings(

lazy val root = project
.in(file("."))
// .enablePlugins(PlayRootProject, ScalaJSPlugin)
.enablePlugins(ScalaJSPlugin)
.disablePlugins(MimaPlugin)
.aggregate(
Expand All @@ -133,8 +132,7 @@ lazy val root = project
lazy val `play-json` = crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Full)
.in(file("play-json"))
// .enablePlugins(PlayLibrary, Playdoc)
.enablePlugins(Publish, Playdoc)
.enablePlugins(Omnidoc, Publish, Playdoc)
.configs(Docs)
.settings(
commonSettings ++ playJsonMimaSettings ++ Seq(
Expand Down Expand Up @@ -227,7 +225,6 @@ lazy val `play-jsonJVM` = `play-json`.jvm.settings(

lazy val `play-json-joda` = project
.in(file("play-json-joda"))
// .enablePlugins(PlayLibrary)
.enablePlugins(Omnidoc, Publish)
.settings(
commonSettings ++ playJsonMimaSettings ++ Seq(
Expand All @@ -242,7 +239,6 @@ lazy val `play-functional` = crossProject(JVMPlatform, JSPlatform)
.settings(
commonSettings ++ playJsonMimaSettings
)
// .enablePlugins(PlayLibrary)
.enablePlugins(Omnidoc, Publish)

lazy val `play-functionalJVM` = `play-functional`.jvm
Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ object Common extends AutoPlugin {
"https://gitter.im/playframework/contributors",
url("https://github.com/playframework")
),
description := "Play mailer plugin"
description := "Play JSON"
)
}
4 changes: 0 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
object Dependencies {
// scalaVersion needs to be kept in sync with travis-ci
val Scala210 = "2.10.7"
val Scala212 = "2.12.10"
val Scala213 = "2.13.1"
val ScalaVersions = Seq(Scala210, Scala212, Scala213)

val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.8.0"))
}
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
resolvers ++= DefaultOptions.resolvers(snapshot = true)
resolvers += Resolver.typesafeRepo("releases")

//addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.0.0"))
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")

addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.2"))
Expand Down

0 comments on commit 730c36d

Please sign in to comment.