Commit 1f108e5

authored

Merge pull request #132 from gourlaysama/fix-native-support

Fix js/native support & bump sbt and plugins versions

2 parents daf9fe2 + 18e1a75 commit 1f108e5Copy full SHA for 1f108e5

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -44,19 +44,16 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
`44`	`44`	`jvmSettings(`
`45`	`45`	`// Mima uses the name of the jvm project in the artifactId`
`46`	`46`	`// when resolving previous versions (so no "-jvm" project)`
`47`		`- name := "scala-parser-combinators",`
`48`	`47`	`OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),`
`49`	`48`	`libraryDependencies += "junit" % "junit" % "4.12" % "test",`
`50`	`49`	`libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"`
`51`	`50`	`).`
`52`	`51`	`jsSettings(`
`53`		`- name := "scala-parser-combinators-js",`
`54`	`52`	`// Scala.js cannot run forked tests`
`55`	`53`	`fork in Test := false`
`56`	`54`	`).`
`57`	`55`	`jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).`
`58`	`56`	`nativeSettings(`
`59`		`- name := "scala-parser-combinators-native",`
`60`	`57`	`scalaVersion := "2.11.11",`
`61`	`58`	`skip in compile := System.getProperty("java.version").startsWith("1.6"),`
`62`	`59`	`test := {},`

Lines changed: 1 addition & 1 deletion

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")`
`2`	`2`
`3`		`-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")`
`4`		`-addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.0")`
`5`		`-addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0")`
`6`		`-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.1")`
	`3`	`+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")`
	`4`	`+addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.2")`
	`5`	`+addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.2")`
	`6`	`+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.3")`

Comments

(0)