Commit 25139f0

authored

Merge pull request #153 from xuwei-k/build-file-warn

fix warning in build.sbt

2 parents 8b02d6f + 1f1d5c1 commit 25139f0Copy full SHA for 25139f0

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import ScalaModulePlugin._`
	`2`	`+import sbtcrossproject.crossProject`
`2`	`3`
`3`	`4`	`scalaVersionsByJvm in ThisBuild := {`
`4`	`5`	`val v211 = "2.11.12"`
`@@ -17,7 +18,7 @@ lazy val root = project.in(file("."))`
`17`	`18`	.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`)
`18`	`19`	`.settings(disablePublishing)`
`19`	`20`
`20`		-lazy val `scala-parser-combinators` = crossProject.in(file(".")).
	`21`	+lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform).in(file(".")).
`21`	`22`	`settings(scalaModuleSettings: _*).`
`22`	`23`	`jvmSettings(scalaModuleSettingsJVM).`
`23`	`24`	`settings(`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")`
`2`	`2`
`3`	`3`	`addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23")`
	`4`	`+`
	`5`	`+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")`

Comments

(0)