Commit 16e756a

authored

Merge pull request #212 from scala-steward/update/sbt-scalajs-0.6.28

Update sbt-scalajs to 0.6.28

2 parents 4cbcb66 + 09512c4 commit 16e756aCopy full SHA for 16e756a

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`language: scala`
`2`	`2`	`jdk:`
`3`		`- - oraclejdk8`
	`3`	`+ - openjdk8`
`4`	`4`	`- openjdk11`
`5`	`5`
`6`	`6`	`scala:`
`7`	`7`	`- 2.11.12`
`8`	`8`	`- 2.12.8`
`9`		`- - 2.13.0-RC1`
	`9`	`+ - 2.13.0-RC2`
`10`	`10`
`11`	`11`	`env:`
`12`	`12`	`global:`
`@@ -19,13 +19,13 @@ env:`
`19`	`19`	`matrix:`
`20`	`20`	`# The empty SCALAJS_VERSION will only compile for the JVM`
`21`	`21`	`- SCALAJS_VERSION=`
`22`		`- - SCALAJS_VERSION=0.6.27`
	`22`	`+ - SCALAJS_VERSION=0.6.28`
`23`	`23`	`- SCALAJS_VERSION=1.0.0-M7`
`24`	`24`
`25`	`25`	`matrix:`
`26`	`26`	`include:`
`27`	`27`	`- env: SCALANATIVE_VERSION=0.3.9`
`28`		`- jdk: oraclejdk8`
	`28`	`+ jdk: openjdk8`
`29`	`29`
`30`	`30`	`script: admin/build.sh`
`31`	`31`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import ScalaModulePlugin._`
`2`	`2`	`import sbtcrossproject.CrossPlugin.autoImport.crossProject`
`3`	`3`
`4`		`-crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1")`
	`4`	`+crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC2")`
`5`	`5`
`6`	`6`	`lazy val root = project.in(file("."))`
`7`	`7`	.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")`
`2`	`2`
`3`	`3`	`val scalaJSVersion =`
`4`		`- Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")`
	`4`	`+ Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")`
`5`	`5`
`6`	`6`	`addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)`
`7`	`7`

Comments

(0)