diff --git a/build.sbt b/build.sbt index b2eb41a3a..86c0e50d4 100644 --- a/build.sbt +++ b/build.sbt @@ -117,7 +117,6 @@ lazy val commonSettings = Def.settings( lazy val root = project .in(file(".")) - // .enablePlugins(PlayRootProject, ScalaJSPlugin) .enablePlugins(ScalaJSPlugin) .disablePlugins(MimaPlugin) .aggregate( @@ -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( @@ -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( @@ -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 diff --git a/project/Common.scala b/project/Common.scala index 2af68d312..e57aa2e8c 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -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" ) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 302fdf72e..cfaadc8c6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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")) } diff --git a/project/plugins.sbt b/project/plugins.sbt index f574091b9..e14fa321b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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"))