Merge branch 'master' into update/scalameta-4.9.0

nafg · Feb 21, 2024 · 239445e · 239445e
2 parents 43ce87d + ef93692
commit 239445e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.0"
 runner.dialect = scala213source3
 
 project.excludePaths = [

diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,7 @@ lazy val `slick-additions-entity` =
   crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure)
     .settings()
 
-val slickVersion = "3.5.0-M5"
+val slickVersion = "3.5.0-RC1"
 
 lazy val `slick-additions` =
   (project in file("."))
@@ -24,7 +24,7 @@ lazy val `slick-additions` =
         "com.lihaoyi"        %% "sourcecode"      % "0.3.1",
         "org.scalatest"      %% "scalatest"       % "3.2.17"  % "test",
         "com.h2database"      % "h2"              % "2.2.224" % "test",
-        "ch.qos.logback"      % "logback-classic" % "1.4.14"  % "test"
+        "ch.qos.logback"      % "logback-classic" % "1.5.0"   % "test"
       )
     )
 
@@ -35,7 +35,7 @@ lazy val `slick-additions-codegen` =
         "com.typesafe.slick" %% "slick-hikaricp" % slickVersion,
         ("org.scalameta"     %% "scalameta"      % "4.9.0")
           .cross(CrossVersion.for3Use2_13).exclude("org.scala-lang.modules", "scala-collection-compat_2.13"),
-        ("org.scalameta"     %% "scalafmt-core"  % "3.7.17")
+        ("org.scalameta"     %% "scalafmt-core"  % "3.8.0")
           .cross(CrossVersion.for3Use2_13).exclude("org.scala-lang.modules", "scala-collection-compat_2.13"),
         "com.h2database"      % "h2"             % "2.2.224" % "test",
         "org.scalatest"      %% "scalatest"      % "3.2.17"  % "test"