Skip to content

Commit

Permalink
Merge 40155ea into d5100ff
Browse files Browse the repository at this point in the history
  • Loading branch information
lloydmeta committed Oct 30, 2018
2 parents d5100ff + 40155ea commit 6aa2959
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions build.sbt
Expand Up @@ -240,20 +240,13 @@ lazy val enumeratumPlayJson = crossProject(JSPlatform, JVMPlatform)
crossScalaVersions := {
val versions = {
if (ScalaJSPlugin.autoImport.jsDependencies.?.value.isDefined)
post210Only(crossScalaVersions.value)
post210Only(crossScalaVersions.value) // make this scalaVersionsAll eventually (https://github.com/lloydmeta/enumeratum/pull/204#issuecomment-434302823)
else
crossScalaVersions.value
crossScalaVersions.value // make this scalaVersionsAll eventually (https://github.com/lloydmeta/enumeratum/pull/204#issuecomment-434302823)
}
versions
},
libraryDependencies ++= {
import org.scalajs.sbtplugin._
val cross = {
if (ScalaJSPlugin.autoImport.jsDependencies.?.value.isDefined)
ScalaJSCrossVersion.binary
else
CrossVersion.binary
}
Seq(
"com.typesafe.play" %%% "play-json" % thePlayJsonVersion(scalaVersion.value),
"com.beachape" %%% "enumeratum" % Versions.Core.stable,
Expand Down

0 comments on commit 6aa2959

Please sign in to comment.