Commit 01ef53c

committed

Merge pull request #19 from retronym/topic/2.11

Version bumps

2 parents f274eba + 3d4b33b commit 01ef53cCopy full SHA for 01ef53c

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ language: scala`
`2`	`2`	`script:`
`3`	`3`	`- sbt ++$TRAVIS_SCALA_VERSION clean update compile test`
`4`	`4`	`scala:`
`5`		`- - 2.11.0-SNAPSHOT`
	`5`	`+ - 2.11.0`
`6`	`6`	`jdk:`
`7`	`7`	`- openjdk6`
`8`	`8`	`- openjdk7`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@ scalaModuleSettings`
`4`	`4`
`5`	`5`	`name := "scala-parser-combinators"`
`6`	`6`
`7`		`-version := "1.0.1-SNAPSHOT"`
	`7`	`+version := "1.0.2-SNAPSHOT"`
`8`	`8`
`9`		`-scalaVersion := "2.11.0-RC1"`
	`9`	`+scalaVersion := "2.11.0"`
`10`	`10`
`11`		`-snapshotScalaBinaryVersion := "2.11.0-RC1"`
	`11`	`+snapshotScalaBinaryVersion := "2.11"`
`12`	`12`
`13`	`13`	`// important!! must come here (why?)`
`14`	`14`	`scalaModuleOsgiSettings`
`@@ -24,7 +24,7 @@ libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"`
`24`	`24`
`25`	`25`	`MimaPlugin.mimaDefaultSettings`
`26`	`26`
`27`		`-MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0")`
	`27`	`+MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.1")`
`28`	`28`
`29`	`29`	`// run mima during tests`
`30`	`30`	`test in Test := {`

Comments

(0)