Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-compiler-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik authored Apr 17, 2024
2 parents cc781b2 + 8bb6137 commit 0bb508e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ lazy val V = new {
def munit = "1.0.0-M10"
def scalacheck = "1.17.0"
}
val scala212 = "2.12.15"
val scala212 = "2.12.19"

val scala213 = "2.13.13"

val scala3 = "3.3.1"

val ScalaVersions = List(scala213, scala212, scala3)
inThisBuild(
List(
Expand Down Expand Up @@ -148,7 +151,7 @@ lazy val typesafe = project
mimaSettings,
moduleName := "metaconfig-typesafe-config",
description := "Integration for HOCON using typesafehub/config.",
libraryDependencies += "com.typesafe" % "config" % "1.4.1"
libraryDependencies += "com.typesafe" % "config" % "1.4.3"
)
.dependsOn(core.jvm)

Expand Down Expand Up @@ -194,7 +197,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
Seq(
"com.github.alexarchambault" %%% "scalacheck-shapeless_1.15" % "1.3.0"
)
else Seq("org.typelevel" %% "shapeless3-deriving" % "3.0.3")
else Seq("org.typelevel" %% "shapeless3-deriving" % "3.0.4")
},
graalVMNativeImageOptions ++= {
val reflectionFile =
Expand Down Expand Up @@ -227,7 +230,7 @@ lazy val docs = project
.settings(
sharedSettings,
libraryDependencies ++= List(
"com.lihaoyi" %%% "scalatags" % "0.12.0",
"com.lihaoyi" %%% "scalatags" % "0.13.1",
"org.scalacheck" %%% "scalacheck" % V.scalacheck,
"org.scalameta" %%% "munit-scalacheck" % V.munit % Test
),
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
Expand Down

0 comments on commit 0bb508e

Please sign in to comment.