Commit 65d984f

authored

Merge pull request #504 from Philippus/drop-scala-2.11

Drop Scala 2.11.x

2 parents 85f4076 + 7450567 commit 65d984fCopy full SHA for 65d984f

File tree

-7

lines changed

.github/workflows
- ci.yml
README.md
build.sbt
shared/src/main/scala-2.13-/scala/util/parsing/input
- ScalaVersionSpecificPagedSeq.scala

-7

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ This library's main strengths are:`
`13`	`13`	`* Stability. It's been around and in wide use for more than a decade.`
`14`	`14`	`* The codebase is modest in size and its internals are fairly simple.`
`15`	`15`	`* It's plain vanilla Scala. No macros, code generation, or other magic is involved.`
`16`		`-* All versions of Scala (2.11, 2.12, 2.13, 3) are supported on all back ends (JVM, JS, Native).`
	`16`	`+* Multiple versions of Scala (2.12, 2.13, 3) are supported on all back ends (JVM, JS, Native).`
`17`	`17`
`18`	`18`	`Its main weaknesses are:`
`19`	`19`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,11 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`22`	`22`	`name := "scala-parser-combinators",`
`23`	`23`	`scalaModuleAutomaticModuleName := Some("scala.util.parsing"),`
`24`	`24`
`25`		`- crossScalaVersions := Seq("2.13.10", "2.12.17", "2.11.12", "3.2.1"),`
	`25`	`+ crossScalaVersions := Seq("2.13.10", "2.12.17", "3.2.1"),`
`26`	`26`	`scalaVersion := crossScalaVersions.value.head,`
`27`	`27`
`28`	`28`	`libraryDependencies += "junit" % "junit" % "4.13.2" % Test,`
`29`	`29`	`libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test,`
`30`		- // so we can `@nowarn` in test code, but only in test code, so the dependency
`31`		`- // doesn't leak downstream. can be dropped when we drop 2.11 from the crossbuild`
`32`		`- libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.9.0" % Test,`
`33`	`30`
`34`	`31`	`apiMappings ++= scalaInstance.value.libraryJars.collect {`
`35`	`32`	`case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`package scala.util.parsing.input`
`14`	`14`
`15`	`15`	`private[input] trait ScalaVersionSpecificPagedSeq[T] {`
`16`		`- // Nothing for 2.11 and 2.12!`
	`16`	`+ // Nothing for 2.12!`
`17`	`17`	`}`

Comments

(0)