luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from alexarchambault/sbt-1.5.6 

Update sbt to 1.5.6
This commit is contained in:
Alexandre Archambault 2022-08-12 20:15:54 +02:00 committed by GitHub
parent 8501e265b5 117ff375b9
commit f3a28b97b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -99,7 +99,7 @@ lazy val `lm-coursier-shaded` = project
"io.get-coursier" %% "coursier" % coursierVersion0, "io.get-coursier" %% "coursier" % coursierVersion0,
"io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1", "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1",
"org.scala-lang.modules" %% "scala-xml" % "2.1.0", // depending on that one so that it doesn't get shaded "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded
"org.scala-sbt" %% "librarymanagement-ivy" % { "org.scala-sbt" %% "librarymanagement-ivy" % {
if (scalaBinaryVersion.value == "2.12") lmVersion if (scalaBinaryVersion.value == "2.12") lmVersion
else lm2_13Version else lm2_13Version

7
project/Settings.scala
View File

@ -36,6 +36,13 @@ object Settings {
scalacOptions ++= { scalacOptions ++= {
if (isAtLeastScala213.value) Seq("-Ymacro-annotations") if (isAtLeastScala213.value) Seq("-Ymacro-annotations")
else Nil else Nil
},
libraryDependencySchemes ++= {
val sv = scalaVersion.value
if (sv.startsWith("2.13."))
Seq("org.scala-lang.modules" %% "scala-xml" % "always")
else
Nil
} }
) ++ { ) ++ {
val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT) val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT)

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.4.9 sbt.version=1.5.6