From c0777ecc0263a13e9c9177066da2c46f57898550 Mon Sep 17 00:00:00 2001 From: Ben Plommer Date: Fri, 18 Nov 2022 11:26:31 +0000 Subject: [PATCH 1/2] Update scala-xml to 2.1.0 --- build.sbt | 9 ++------- version.sbt | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index d18171f8..6095025d 100644 --- a/build.sbt +++ b/build.sbt @@ -31,12 +31,7 @@ lazy val mockSettings = Seq( ) // Everything blows up if the plugin uses scala-xml 2.x -val scalaXmlVersion = - Def.setting( - if (scalaVersion.value.startsWith("2.12")) "1.3.0" - else - "2.0.1" - ) +val scalaXmlVersion = "2.1.0" lazy val publishSettings = Seq( publishTo := { @@ -89,7 +84,7 @@ lazy val shared = .settings(publishSettings: _*) .settings( name := "scalapact-shared", - libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion.value) + libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion) ) lazy val core = diff --git a/version.sbt b/version.sbt index b7a4313e..cbf330b0 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "4.4.1-SNAPSHOT" +version in ThisBuild := "5.0.0-SNAPSHOT" From fe08c8d1588f9a73b9e00bd5144564f73cce2c59 Mon Sep 17 00:00:00 2001 From: Ben Plommer Date: Fri, 18 Nov 2022 11:28:31 +0000 Subject: [PATCH 2/2] Remove obsolete comment --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6095025d..eb51d7d7 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,6 @@ lazy val mockSettings = Seq( libraryDependencies += "org.scalamock" %% "scalamock" % "5.1.0" % Test ) -// Everything blows up if the plugin uses scala-xml 2.x val scalaXmlVersion = "2.1.0" lazy val publishSettings = Seq(