Merge pull request #598 from iheartradio/update/scala-library-2.12.18

Update scala-library 2.12.18
iheartradio · Jul 20, 2023 · aaa6efb · aaa6efb
2 parents 160b9d9 + 46082ad
commit aaa6efb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ lazy val noPublishSettings = Seq(
   publishArtifact := false
 )
 
-lazy val scalaV = "2.12.16"
+lazy val scalaV = "2.12.18"
 
 lazy val root = project.in(file("."))
   .aggregate(playSwagger, sbtPlaySwagger)
@@ -47,6 +47,7 @@ lazy val playSwagger = project.in(file("core"))
         "joda-time" % "joda-time" % "2.12.5" % Test,
         "com.google.errorprone" % "error_prone_annotations" % "2.20.0" % Test
       ),
+    libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always,
     addCompilerPlugin("com.github.takezoe" %% "runtime-scaladoc-reader" % "1.0.3"),
     scalaVersion := scalaV,
     crossScalaVersions := Seq(scalaVersion.value, "2.13.11"),

diff --git a/example/build.sbt b/example/build.sbt
@@ -9,7 +9,7 @@ scalafixDependencies in ThisBuild ++= Seq(
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala, SwaggerPlugin) //enable plugin
 
-scalaVersion := "2.12.16"
+scalaVersion := "2.12.18"
 
 libraryDependencies ++= Seq(
   jdbc,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,4 +10,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
 
+ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
diff --git a/sbtPlugin/src/sbt-test/sbt-play-swagger/generate-docs-from-scala-doc/build.sbt b/sbtPlugin/src/sbt-test/sbt-play-swagger/generate-docs-from-scala-doc/build.sbt
@@ -9,7 +9,7 @@ name := "app"
 
 version := "1.0.1-BETA1"
 
-scalaVersion := "2.12.16"
+scalaVersion := "2.12.18"
 
 swaggerDomainNameSpaces := Seq("namespace1", "namespace2")
 

diff --git a/sbtPlugin/src/sbt-test/sbt-play-swagger/generate-docs/build.sbt b/sbtPlugin/src/sbt-test/sbt-play-swagger/generate-docs/build.sbt
@@ -9,7 +9,7 @@ name := "app"
 
 version := "1.0.1-BETA1"
 
-scalaVersion := "2.12.16"
+scalaVersion := "2.12.18"
 
 swaggerDomainNameSpaces := Seq("namespace1", "namespace2")