Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-native-packager-1.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik authored Apr 17, 2024
2 parents 5283308 + 98235eb commit 3fc39fb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
13 changes: 8 additions & 5 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 scala213 = "2.13.8"
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
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.9
14 changes: 11 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")

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")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15")

0 comments on commit 3fc39fb

Please sign in to comment.