Commit 6ee0fac

authored

Merge pull request #107 from Sciss/work

support for Scala 2.13.0-RC2

2 parents 127d62f + 27a437f commit 6ee0facCopy full SHA for 6ee0fac

File tree

2 files changed

+12

-6

lines changed

.travis.yml
build.sbt

2 files changed

+12

-6

lines changed

`‎.travis.yml‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+dist: trusty`
	`2`	`+`
`1`	`3`	`language: scala`
`2`	`4`
`3`	`5`	`env:`

`‎build.sbt‎`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")`
`10`	`10`
`11`	`11`	`// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]`
`12`	`12`	`scalaVersionsByJvm in ThisBuild := Map(`
`13`		`- 8 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> true),`
`14`		`- 9 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),`
`15`		`- 10 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),`
`16`		`- 11 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),`
`17`		`- 12 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false)`
	`13`	`+ 8 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> true),`
	`14`	`+ 9 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),`
	`15`	`+ 10 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),`
	`16`	`+ 11 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),`
	`17`	`+ 12 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false)`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`scalaVersion in ThisBuild := "2.12.8"`
`@@ -29,7 +29,11 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project`
`29`	`29`	`lazy val swing = project.in(file("."))`
`30`	`30`	`.settings(`
`31`	`31`	`libraryDependencies += {`
`32`		`- "org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test`
	`32`	`+ if (scalaVersion.value == "2.13.0-RC2") {`
	`33`	`+ "org.scalatest" % "scalatest_2.13.0-RC1" % "3.0.8-RC2" % Test // it works`
	`34`	`+ } else {`
	`35`	`+ "org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test`
	`36`	`+ }`
`33`	`37`	`},`
`34`	`38`	// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
`35`	`39`	// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6ee0fac

File tree

2 files changed

2 files changed

`‎.travis.yml‎`

`‎build.sbt‎`

0 commit comments