Merge branch 'develop' into update/sbt-ide-settings-1.1.2

sbt · Oct 30, 2023 · 92077c8 · 92077c8
2 parents 0cbe87e + 47ebeb5
commit 92077c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.14
+version = 3.7.15
 runner.dialect = scala212
 
 project.git = true

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,8 +13,8 @@ object Dependencies {
   val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
   val scala212_213 = Seq(defaultScalaVersion, scala213)
 
-  private val ioVersion = nightlyVersion.getOrElse("1.9.1")
-  private val utilVersion = nightlyVersion.getOrElse("1.9.6")
+  private val ioVersion = nightlyVersion.getOrElse("1.9.7")
+  private val utilVersion = nightlyVersion.getOrElse("1.9.7")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -11,5 +11,5 @@ libraryDependencies += "com.github.os72" % "protoc-jar" % "3.11.4" // sync w/ Pr
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")