From 5f6d7231701ea99e0ae75427b5f6e44e29ee6d64 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 25 Apr 2023 10:03:51 -0400 Subject: [PATCH 1/4] SCoverage removed due to bloop conflict --- project/plugins.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bdb54f675bf..e56c78ca0de 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,5 @@ addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.1") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.4") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") addDependencyTreePlugin From ee14fd0984ef124ba6a3f3d49736baecfb360627 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 25 Apr 2023 15:43:35 -0400 Subject: [PATCH 2/4] Modify dependency scheme instead for scala-xml --- project/plugins.sbt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index e56c78ca0de..75a10f915fd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,3 +3,9 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.1") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") addDependencyTreePlugin + +/** + * Force the version scheme for scala-xml to not use semantic versioning to anticipate a binary incompatibility + * This currently was already happening for some build servers, but bloop seems to struggle with this. + */ +libraryDependencySchemes += "org.scala-lang.modules" % "scala-xml_2.12" % VersionScheme.Always From 2e7ba991cae1f93f1857fa1c3b3f64d58c4ca237 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 26 Apr 2023 12:17:14 -0400 Subject: [PATCH 3/4] Try different version --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 75a10f915fd..2cc595d05e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addDependencyTreePlugin * Force the version scheme for scala-xml to not use semantic versioning to anticipate a binary incompatibility * This currently was already happening for some build servers, but bloop seems to struggle with this. */ -libraryDependencySchemes += "org.scala-lang.modules" % "scala-xml_2.12" % VersionScheme.Always +libraryDependencySchemes += "org.scala-lang.modules" % "scala-xml_2.13" % VersionScheme.Always From f5b35d276b6834ee70d61627b1c8b38f2a6b0f41 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 12 May 2023 12:44:33 -0400 Subject: [PATCH 4/4] Revert removal of scoverage --- project/plugins.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 2cc595d05e6..593533c3a11 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,7 @@ addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.1") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.4") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") addDependencyTreePlugin @@ -8,4 +9,4 @@ addDependencyTreePlugin * Force the version scheme for scala-xml to not use semantic versioning to anticipate a binary incompatibility * This currently was already happening for some build servers, but bloop seems to struggle with this. */ -libraryDependencySchemes += "org.scala-lang.modules" % "scala-xml_2.13" % VersionScheme.Always +libraryDependencySchemes += "org.scala-lang.modules" % "scala-xml_2.12" % VersionScheme.Always