Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.12.19
Browse files Browse the repository at this point in the history
  • Loading branch information
houcros authored Mar 4, 2024
2 parents a1e7df6 + 05ebb3e commit 477b430
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ lazy val root = (project in file("."))
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
scmInfo := Some(ScmInfo(url("https://github.com/moia-oss/scala-pekko-http-client"), "scm:git@github.com:moia-oss/scala-pekko-http-client.git")),
homepage := Some(url("https://github.com/moia-oss/scala-pekko-http-client")),
scalaVersion := "2.13.12",
crossScalaVersions := List("2.12.19", "2.13.12"),
scalaVersion := "2.13.13",
crossScalaVersions := List("2.12.19", "2.13.13"),
versionScheme := Some("early-semver"),
scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down Expand Up @@ -42,7 +42,7 @@ lazy val pekkoDependencies = Seq(
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test
)

lazy val awsJavaSdkVersion = "2.24.10"
lazy val awsJavaSdkVersion = "2.24.13"
lazy val awsDependencies = Seq(
"software.amazon.awssdk" % "core" % awsJavaSdkVersion,
"software.amazon.awssdk" % "sts" % awsJavaSdkVersion
Expand All @@ -56,14 +56,14 @@ lazy val testDependencies = Seq(

lazy val loggingDependencies = Seq(
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"ch.qos.logback" % "logback-classic" % "1.5.0" % Test
"ch.qos.logback" % "logback-classic" % "1.5.2" % Test
)

lazy val scalaDependencies = Seq(
"org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0"
)

ThisBuild / scapegoatVersion := "2.1.4"
ThisBuild / scapegoatVersion := "2.1.5"

lazy val scalacOptions_2_12 = Seq(
"-unchecked",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

// sbt> scapegoat
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.2")
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.3")

// Publish to sonatype
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
Expand Down

0 comments on commit 477b430

Please sign in to comment.