From 594adbbc9b352c3799964f4155c4abbddb5395d1 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Thu, 5 Jul 2018 22:33:22 +0900 Subject: [PATCH] scala-js 0.6.24 --- build.sbt | 8 ++++---- project/plugins.sbt | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 80533bbc..e683dbf0 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,8 @@ import sbt._ import sbt.Keys._ import sbtrelease.ReleasePlugin.autoImport._ import com.typesafe.sbt.pgp.PgpKeys -import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ -import org.scalajs.sbtplugin.cross.CrossProject -import org.scalajs.sbtplugin.cross.CrossType +import sbtcrossproject.CrossProject +import sbtcrossproject.CrossType val Org = "org.scoverage" val MockitoVersion = "2.19.0" @@ -62,7 +61,8 @@ lazy val root = Project("scalac-scoverage", file(".")) .settings(publishLocal := {}) .aggregate(plugin, runtime.jvm, runtime.js) -lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scoverage-runtime"), CrossType.Full) +lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scoverage-runtime"))(JVMPlatform, JSPlatform) + .crossType(CrossType.Full) .settings(name := "scalac-scoverage-runtime") .settings(appSettings: _*) .jvmSettings( diff --git a/project/plugins.sbt b/project/plugins.sbt index 69d81916..1fb527d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24") + +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")