Commit a2d6d9a

authored

Merge pull request #447 from SethTisue/version-bumps-1.x

bump Scala, sbt, Scala.js versions

2 parents c60de43 + 57353cd commit a2d6d9aCopy full SHA for a2d6d9a

File tree

+17

-11

lines changed

+17

-11

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@ language: scala`
`6`	`6`
`7`	`7`	`scala:`
`8`	`8`	`- 2.11.12`
`9`		`- - 2.12.10`
`10`		`- - 2.13.1`
	`9`	`+ - 2.12.12`
	`10`	`+ - 2.13.3`
`11`	`11`
`12`	`12`	`env:`
`13`	`13`	`- SCALAJS_VERSION= ADOPTOPENJDK=8`
`14`		`- - SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8`
	`14`	`+ - SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8`
`15`	`15`	`- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8`
`16`	`16`	`- SCALAJS_VERSION= ADOPTOPENJDK=11`
`17`	`17`
`18`	`18`	`matrix:`
`19`	`19`	`exclude:`
`20`	`20`	`- scala: 2.11.12`
`21`		`- env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8`
	`21`	`+ env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8`
`22`	`22`	`- scala: 2.11.12`
`23`	`23`	`env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8`
`24`	`24`

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,20 @@ import org.junit.Test`
`4`	`4`
`5`	`5`	`class CompilerErrors extends CompilerTesting {`
`6`	`6`	`@Test`
`7`		`- def t7185() =`
`8`		`- expectXmlError("""\|overloaded method value apply with alternatives:`
`9`		`- \| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>`
`10`		`- \| (i: Int)scala.xml.Node`
`11`		`- \| cannot be applied to ()""".stripMargin,`
	`7`	`+ def t7185() = {`
	`8`	`+ // the error message here differs a bit by Scala version`
	`9`	`+ import util.Properties.versionNumberString`
	`10`	`+ val thing =`
	`11`	`+ if (versionNumberString.startsWith("2.11") \|\| versionNumberString.startsWith("2.12")) "method value"`
	`12`	`+ else "method"`
	`13`	`+ expectXmlError(s"""\|overloaded $thing apply with alternatives:`
	`14`	`+ \| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>`
	`15`	`+ \| (i: Int)scala.xml.Node`
	`16`	`+ \| cannot be applied to ()""".stripMargin,`
`12`	`17`	`"""\|object Test {`
`13`	`18`	`\| <e></e>()`
`14`	`19`	`\|}""")`
	`20`	`+ }`
`15`	`21`
`16`	`22`	`@Test`
`17`	`23`	`def t1878_typer() =`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`val scalaJSVersion =`
`2`		`- Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.32")`
	`2`	`+ Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33")`
`3`	`3`
`4`	`4`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.3")`
`5`	`5`	`addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")`

Comments

(0)