Commit 0b45612

authored

Merge pull request #335 from SethTisue/scala-3.0.0-M3

2 parents 011dee7 + 58eb05d commit 0b45612Copy full SHA for 0b45612

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@ import: scala/scala-dev:travis/default.yml`
`5`	`5`	`language: scala`
`6`	`6`
`7`	`7`	`scala:`
`8`		`- - 3.0.0-M2`
	`8`	`+ - 3.0.0-M3`
`9`	`9`	`- 2.11.12`
`10`	`10`	`- 2.12.12`
`11`	`11`	`- 2.13.4`
`12`	`12`
`13`	`13`	`env:`
`14`		`- - ADOPTOPENJDK=8 SCALAJS_VERSION=`
`15`		`- - ADOPTOPENJDK=8 SCALAJS_VERSION=1.3.1`
`16`		`- - ADOPTOPENJDK=11 SCALAJS_VERSION=`
	`14`	`+ - ADOPTOPENJDK=8 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335`
	`15`	`+ - ADOPTOPENJDK=8 SCALAJS_VERSION=1.3.1 CACHE_WORKAROUND=see-PR-335`
	`16`	`+ - ADOPTOPENJDK=11 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335`
`17`	`17`
`18`	`18`	`matrix:`
`19`	`19`	`include:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`15`	`15`	`libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,`
`16`	`16`	// so we can `@nowarn` in test code, but only in test code, so the dependency
`17`	`17`	`// doesn't leak downstream`
`18`		`- libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.3.1" % Test,`
	`18`	`+ libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.3.2" % Test,`
`19`	`19`
`20`	`20`	`apiMappings ++= scalaInstance.value.libraryJars.collect {`
`21`	`21`	`case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>`

Comments

(0)