Permalink
Browse files

add sbt-scalajs-crossproject. fix warnings in build.sbt

  • Loading branch information...
xuwei-k committed Sep 14, 2018
1 parent bef7b81 commit bb85789ce16f81690794109947ffa90a83c4e0ce
Showing with 5 additions and 3 deletions.
  1. +3 −3 build.sbt
  2. +2 −0 project/plugins.sbt
View
@@ -2,7 +2,7 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
import scalariform.formatter.preferences._
import scala.xml.transform._
import scala.xml.{Node => XNode, NodeSeq}
import org.scalajs.sbtplugin.cross.CrossType
import sbtcrossproject.{CrossType, crossProject}
val commonSettings = Seq(
version := "2.1.5-SNAPSHOT",
@@ -112,7 +112,7 @@ lazy val parboiledOsgiSettings = osgiSettings ++ Seq(
OsgiKeys.privatePackage := Seq()
)
lazy val parboiled = crossProject.crossType(CrossType.Pure)
lazy val parboiled = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure)
.dependsOn(parboiledCore)
.settings(commonSettings: _*)
.settings(formattingSettings: _*)
@@ -145,7 +145,7 @@ lazy val parboiledJS = parboiled.js
lazy val generateActionOps = taskKey[Seq[File]]("Generates the ActionOps boilerplate source file")
lazy val parboiledCore = crossProject.crossType(CrossType.Pure).in(file("parboiled-core"))
lazy val parboiledCore = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure).in(file("parboiled-core"))
.settings(commonSettings: _*)
.settings(formattingSettings: _*)
.settings(noPublishingSettings: _*)
View
@@ -7,3 +7,5 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 comments on commit bb85789

Please sign in to comment.