Skip to content

Commit

Permalink
Merge pull request #190 from scala-steward/update/scala-parser-combin…
Browse files Browse the repository at this point in the history
…ators-2.1.0

scala-parser-combinators 2.1.0 (was 2.0.0)
  • Loading branch information
mkurz authored Jan 3, 2022
2 parents c36548f + 3f61cd1 commit a5d78b7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ project/boot/
.lib/
dist/*
project/plugins/project/
.bsp/

# Scala-IDE specific
.scala_dependencies
Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ lazy val cachecontrol = (project in file("."))
.enablePlugins(Common)
.settings(
libraryDependencies ++= Seq(
parserCombinators,
parserCombinators(scalaVersion.value),
scalaTest,
slf4j,
slf4jSimple % Test
),
mimaPreviousArtifacts := Set(
organization.value %% name.value % previousStableVersion.value
.getOrElse(throw new Error("Unable to determine previous version"))
),
// On the main branch we don't check for incompatible changes,
// because it's ok to introduce breaking changes between minor version bumps
mimaPreviousArtifacts := Set.empty,
sonatypeProfileName := "com.typesafe",
headerLicense := {
Some(
Expand Down
9 changes: 7 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ object Dependencies {

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

val parserCombinators =
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.0.0"
def parserCombinators(scalaVersion: String) =
"org.scala-lang.modules" %% "scala-parser-combinators" % {
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, _)) => "1.1.2"
case _ => "2.1.0"
}
}

val slf4jVersion = "1.7.32"
val slf4j = "org.slf4j" % "slf4j-api" % slf4jVersion
Expand Down

0 comments on commit a5d78b7

Please sign in to comment.