Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.13.14
Browse files Browse the repository at this point in the history
  • Loading branch information
magro authored Jun 23, 2024
2 parents 5110309 + 2b64ba4 commit 6643b55
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ scmInfo := Some(ScmInfo(url("https://github.com/inoio/solrs"), "[email protected]:i

licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))

scalaVersion := "3.3.3"
scalaVersion := "3.4.1"

// Remember: also update scala versions in .travis.yml!
crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.3")
crossScalaVersions := Seq("2.12.19", "2.13.14", "3.4.1")

scalacOptions ++= Seq(
"-unchecked",
Expand All @@ -41,12 +41,12 @@ resolvers ++= Seq(
)

val solrVersion = "9.4.1"
val slf4jVersion = "2.0.12"
val slf4jVersion = "2.0.13"

libraryDependencies ++= Seq(
"org.apache.solr" % "solr-solrj" % solrVersion,
"org.asynchttpclient" % "async-http-client" % "2.12.3",
"org.scala-lang.modules" %% "scala-xml" % "2.2.0",
"org.scala-lang.modules" %% "scala-xml" % "2.3.0",
"org.scala-lang.modules" %% "scala-java8-compat"% "1.0.2",
"io.dropwizard.metrics" % "metrics-core" % "4.2.25" % "optional",
"org.slf4j" % "slf4j-api" % slf4jVersion,
Expand All @@ -58,7 +58,7 @@ libraryDependencies ++= Seq(
"org.hamcrest" % "hamcrest-library" % "2.2" % "test",
"dev.zio" %% "izumi-reflect" % "2.3.8" % Test,
"org.apache.solr" % "solr-test-framework" % solrVersion % "test" excludeAll(ExclusionRule(organization = "org.apache.logging.log4j")),
"com.twitter" %% "util-core" % "23.11.0" % "optional"
"com.twitter" %% "util-core" % "24.2.0" % "optional"
)

excludeDependencies ++= (
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ ThisBuild / libraryDependencySchemes ++= Seq(
)

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
// use a newer version of paradox (site would pull in automatically an older version)
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
// addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.4.0")
addDependencyTreePlugin
Expand Down

0 comments on commit 6643b55

Please sign in to comment.