Skip to content

Commit

Permalink
dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
rmgk committed Jan 14, 2025
1 parent fa5cdc6 commit 1d50410
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// skip version 3.8.2 seems to make a lot of questionable formatting choices
// skip version 3.8.3, still a lot of questionable formatting
version = 3.8.4-RC3
version = 3.8.4

// alignment is cute. i think it helps readability overall, but sometimes it produces silly results. consider restructuring code in those cases
align.preset = more
Expand Down Expand Up @@ -39,7 +39,7 @@ indentOperator.excludeRegex = "^$"

// scala 2, scala 3, and sbt all use slightly different variants on scala syntax
// this defaults to scala 3 syntax, but has some well-known exceptions
runner.dialect = scala3
runner.dialect = scala36

fileOverride {
"glob:**/scala-2/**" {
Expand All @@ -54,6 +54,6 @@ fileOverride {
}
// ensure that scala files in source are scala3 even if they are in a folder called "project"
"glob:**/src/*/scala/**/*.scala" {
runner.dialect = scala3
runner.dialect = scala36
}
}
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@ import sbt.Keys.libraryDependencies

object Dependencies {

val munit = libraryDependencies += "org.scalameta" %%% "munit" % "1.0.3" % Test
val munit = libraryDependencies += "org.scalameta" %%% "munit" % "1.0.4" % Test
val munitCheck = libraryDependencies += "org.scalameta" %%% "munit-scalacheck" % "1.0.0" % Test
val pprint = libraryDependencies += "com.lihaoyi" %%% "pprint" % "0.9.0"
val scalajsDom = libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0"
val catsParse = libraryDependencies += "org.typelevel" %%% "cats-parse" % "1.1.0"
val conscript = libraryDependencies += "org.conscrypt" % "conscrypt-openjdk-uber" % "2.5.2"
val decline = libraryDependencies += "com.monovore" %%% "decline" % "2.4.1"
val decline = libraryDependencies += "com.monovore" %%% "decline" % "2.5.0"
val fansi = libraryDependencies += "com.lihaoyi" %%% "fansi" % "0.5.0"
val jetcd = libraryDependencies += "io.etcd" % "jetcd-core" % "0.8.4"
val monocleCore = libraryDependencies += "dev.optics" %%% "monocle-core" % "3.3.0"
val scalaSwing = libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
val scalaXml = libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
val slf4j = libraryDependencies += "org.slf4j" % "slf4j-jdk14" % "2.0.16" // jdk 1.4
val slf4jSimple = libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.16" % Test
val sttpCore = libraryDependencies += "com.softwaremill.sttp.client4" %%% "core" % "4.0.0-M20"
val sttpCore = libraryDependencies += "com.softwaremill.sttp.client4" %%% "core" % "4.0.0-M24"
val tink = libraryDependencies += "com.google.crypto.tink" % "tink" % "1.15.0"

val bouncyCastle = libraryDependencies ++=
List(
// Note, jdk18 means JDK 1.8
"org.bouncycastle" % "bcprov-jdk18on" % "1.79",
"org.bouncycastle" % "bcpkix-jdk18on" % "1.79",
"io.github.hakky54" % "sslcontext-kickstart" % "8.3.7",
"io.github.hakky54" % "sslcontext-kickstart-for-pem" % "8.3.7",
"io.github.hakky54" % "sslcontext-kickstart" % "9.0.0",
"io.github.hakky54" % "sslcontext-kickstart-for-pem" % "9.0.0",
)

def borer = libraryDependencies ++= Seq(
Expand All @@ -46,8 +46,8 @@ object Dependencies {

def jsoniterScala =
libraryDependencies ++= Seq(
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.32.0",
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.32.0" % Provided
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.33.0",
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.33.0" % Provided
)

def scalafx: ModuleID = "org.scalafx" %% "scalafx" % "23.0.1-R34"
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* and may contain unused dependencies */

// scalajs 1.0
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1")
libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"

// scalanative
Expand All @@ -17,7 +17,7 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") // https://github.com
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")

// packaging
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")

// tooling
Expand Down

0 comments on commit 1d50410

Please sign in to comment.