Merge branch 'develop' into update/sbt-pgp-2.3.0

7mind · Oct 15, 2024 · e79909b · e79909b
2 parents 416bbcf + 86104ef
commit e79909b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1843,7 +1843,7 @@ lazy val `idealingua-v1` = (project in file("."))
     ThisBuild / scalacOptions += """-Xmacro-settings:sbt-js-version=1.0.2""",
     ThisBuild / scalacOptions += """-Xmacro-settings:crossproject-version=1.3.2""",
     ThisBuild / scalacOptions += s"-Xmacro-settings:is-ci=${insideCI.value}",
-    libraryDependencies += "io.7mind.izumi.sbt" % "sbtgen_2.13" % "0.0.102" % Provided,
+    libraryDependencies += "io.7mind.izumi.sbt" % "sbtgen_2.13" % "0.0.104" % Provided,
     ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
   )
   .enablePlugins(IzumiPlugin)

diff --git a/project/Deps.sc b/project/Deps.sc
@@ -1,4 +1,4 @@
-import $ivy.`io.7mind.izumi.sbt:sbtgen_2.13:0.0.102`
+import $ivy.`io.7mind.izumi.sbt:sbtgen_2.13:0.0.104`
 import izumi.sbtgen._
 import izumi.sbtgen.model._
 
@@ -135,9 +135,9 @@ object Idealingua {
   import Deps._
 
   // DON'T REMOVE, these variables are read from CI build (build.sh)
-  final val scala212 = ScalaVersion("2.12.19")
-  final val scala213 = ScalaVersion("2.13.14")
-  final val scala300 = ScalaVersion("3.3.4-RC1")
+  final val scala212 = ScalaVersion("2.12.20")
+  final val scala213 = ScalaVersion("2.13.15")
+  final val scala300 = ScalaVersion("3.3.4")
 
   object Groups {
     final val idealingua = Set(Group("idealingua"))

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -3,10 +3,10 @@ object V {
 
   val scalatest = "3.2.19"
 
-  val http4s       = "0.23.27"
+  val http4s       = "0.23.28"
   val http4s_blaze = "0.23.16"
 
-  val scalameta = "4.9.9" // Not available for Scala 3 yet
+  val scalameta = "4.10.2" // Not available for Scala 3 yet
   val fastparse = "3.1.1" // 3.0.0 is available for Scala 3
 
   val scala_xml = "2.3.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.10.1
+sbt.version = 1.10.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -15,7 +15,7 @@ addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 
 ////////////////////////////////////////////////////////////////////////////////
 
-addSbtPlugin("io.7mind.izumi.sbt" % "sbt-izumi" % "0.0.102")
+addSbtPlugin("io.7mind.izumi.sbt" % "sbt-izumi" % "0.0.104")
 
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % PV.sbt_pgp)
 

diff --git a/project/project/PluginVersions.scala b/project/project/PluginVersions.scala
@@ -1,6 +1,6 @@
 object PV {
   val izumi = "1.2.12"
 
-  val sbt_scoverage = "2.1.0"
+  val sbt_scoverage = "2.1.1"
   val sbt_pgp       = "2.3.0"
 }