Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Feb 21, 2024
1 parent 5f32ba3 commit 2a1748c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 24 deletions.
7 changes: 1 addition & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ lazy val core = project
"ws.unfiltered" %% "unfiltered-filter" % unfilteredVersion,
"ws.unfiltered" %% "unfiltered-jetty" % unfilteredVersion,
"ws.unfiltered" %% "unfiltered-specs2" % unfilteredVersion % Test,
).map(
// Force sbt-site to Scala XML 2.1
_.exclude("org.scala-lang.modules", "scala-xml_2.12")
) ++ Seq(
"org.scala-lang.modules" %% "scala-xml" % "2.1.0"
)
)

Expand Down Expand Up @@ -132,7 +127,7 @@ lazy val paradox = project
.in(file("paradox"))
.settings(
name := "sbt-site-paradox",
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6")
)
.dependsOn(core)
.enablePlugins(SbtPlugin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))

resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven"

addSbtPlugin(
("com.github.sbt" % "sbt-ghpages" % "0.7.0")
// sbt-ghpages depends on sbt-site 1.4.1, which pulls Scala XML 1.x
.exclude("org.scala-lang.modules", "scala-xml_2.12")
)
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.7
14 changes: 4 additions & 10 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0")
//#sbt-ghpages
addSbtPlugin(
("com.github.sbt" % "sbt-ghpages" % "0.7.0")
// sbt-ghpages depends on sbt-site 1.4.1, which pulls Scala XML 1.x
.exclude("org.scala-lang.modules", "scala-xml_2.12")
)
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
//#sbt-ghpages
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6") // https://www.scala-sbt.org/sbt-paradox-material-theme/getting-started.html#jdk-11-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-parser-combinators" % "always"

0 comments on commit 2a1748c

Please sign in to comment.