diff --git a/.gitignore b/.gitignore index ae18f11..e6e6218 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ project/boot/ .lib/ dist/* project/plugins/project/ +.bsp/ # Scala-IDE specific .scala_dependencies diff --git a/build.sbt b/build.sbt index 587b3f3..5c3142c 100644 --- a/build.sbt +++ b/build.sbt @@ -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( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f596cfd..689ae1e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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