Commit c70911d

author

A. Alonso Dominguez

authored

Merge branch '1.0.x' into native

2 parents 7370390 + 615b70f commit c70911dCopy full SHA for c70911d

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ import sbtcrossproject.{crossProject, CrossType}`
`3`	`3`
`4`	`4`	`scalaVersionsByJvm in ThisBuild := {`
`5`	`5`	`val v211 = "2.11.11"`
`6`		`- val v212 = "2.12.2"`
`7`		`- val v213 = "2.13.0-M1"`
	`6`	`+ val v212 = "2.12.3"`
	`7`	`+ val v213 = "2.13.0-M2"`
`8`	`8`
`9`	`9`	`Map(`
`10`	`10`	`6 -> List(v211 -> true),`
`@@ -21,10 +21,8 @@ lazy val root = project.in(file("."))`
`21`	`21`	lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file(".")).
`22`	`22`	`settings(scalaModuleSettings: _*).`
`23`	`23`	`settings(`
`24`		`- moduleName := "scala-parser-combinators",`
`25`		`- repoName := moduleName.value,`
`26`		`- version := "1.0.7-SNAPSHOT",`
`27`		`-`
	`24`	`+ name := "scala-parser-combinators",`
	`25`	`+ version := "1.0.7-SNAPSHOT",`
`28`	`26`	`mimaPreviousVersion := Some("1.0.5"),`
`29`	`27`
`30`	`28`	`apiMappings += (scalaInstance.value.libraryJar ->`

Comments

(0)