Skip to content

Commit a5d78b7

Browse files
authored
Merge pull request #190 from scala-steward/update/scala-parser-combinators-2.1.0
scala-parser-combinators 2.1.0 (was 2.0.0)
2 parents c36548f + 3f61cd1 commit a5d78b7

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ project/boot/
6868
.lib/
6969
dist/*
7070
project/plugins/project/
71+
.bsp/
7172

7273
# Scala-IDE specific
7374
.scala_dependencies

build.sbt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ lazy val cachecontrol = (project in file("."))
1818
.enablePlugins(Common)
1919
.settings(
2020
libraryDependencies ++= Seq(
21-
parserCombinators,
21+
parserCombinators(scalaVersion.value),
2222
scalaTest,
2323
slf4j,
2424
slf4jSimple % Test
2525
),
26-
mimaPreviousArtifacts := Set(
27-
organization.value %% name.value % previousStableVersion.value
28-
.getOrElse(throw new Error("Unable to determine previous version"))
29-
),
26+
// On the main branch we don't check for incompatible changes,
27+
// because it's ok to introduce breaking changes between minor version bumps
28+
mimaPreviousArtifacts := Set.empty,
3029
sonatypeProfileName := "com.typesafe",
3130
headerLicense := {
3231
Some(

project/Dependencies.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ object Dependencies {
1212

1313
def scalaTest = "org.scalatest" %% "scalatest" % "3.2.10" % Test
1414

15-
val parserCombinators =
16-
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.0.0"
15+
def parserCombinators(scalaVersion: String) =
16+
"org.scala-lang.modules" %% "scala-parser-combinators" % {
17+
CrossVersion.partialVersion(scalaVersion) match {
18+
case Some((2, _)) => "1.1.2"
19+
case _ => "2.1.0"
20+
}
21+
}
1722

1823
val slf4jVersion = "1.7.32"
1924
val slf4j = "org.slf4j" % "slf4j-api" % slf4jVersion

0 commit comments

Comments
 (0)