From 6fa558b982676cdb7a2d234dc27b14fe72b00875 Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Wed, 13 Oct 2021 23:19:30 +0200
Subject: [PATCH 1/4] scala-parser-combinators 2.1.0 (was 2.0.0)

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f596cfd..52fc697 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -13,7 +13,7 @@ object Dependencies {
   def scalaTest = "org.scalatest" %% "scalatest" % "3.2.10" % Test
 
   val parserCombinators =
-    "org.scala-lang.modules" %% "scala-parser-combinators" % "2.0.0"
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.0"
 
   val slf4jVersion = "1.7.32"
   val slf4j        = "org.slf4j" % "slf4j-api"    % slf4jVersion

From c918c2d830f4c161293be2975b26ba482cc1bdc8 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 3 Jan 2022 17:04:59 +0100
Subject: [PATCH 2/4] scala-parser-combinators stays on 1.x for Scala 2.x

---
 build.sbt                  | 2 +-
 project/Dependencies.scala | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index 587b3f3..56edc1e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,7 +18,7 @@ lazy val cachecontrol = (project in file("."))
   .enablePlugins(Common)
   .settings(
     libraryDependencies ++= Seq(
-      parserCombinators,
+      parserCombinators(scalaVersion.value),
       scalaTest,
       slf4j,
       slf4jSimple % Test
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 52fc697..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.1.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

From 0f06b49f5101f1f9eff24162f2a49f4853ac5f7c Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 3 Jan 2022 17:06:37 +0100
Subject: [PATCH 3/4] Update gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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

From 3f61cd14570ffe922eb8b2578516e17b304f279b Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 3 Jan 2022 19:47:35 +0100
Subject: [PATCH 4/4] Don't set mimaPreviousArtifacts on the main branch

---
 build.sbt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 56edc1e..5c3142c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -23,10 +23,9 @@ lazy val cachecontrol = (project in file("."))
       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(