From 95506918e328b99d90393232110e3363f6e10d85 Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Mon, 12 Jun 2023 22:20:54 +0400 Subject: [PATCH] Update Scala, scalafix and ZIO versions (#232) * Update Scala, scalafix and ZIO versions * trigger CI --- README.md | 14 +++++++------- docs/index.md | 14 +++++++------- project/Versions.scala | 8 ++++---- project/plugins.sbt | 6 +++--- zio-sbt-ci/build.sbt | 2 +- zio-sbt-ecosystem/build.sbt | 6 +++--- .../src/main/scala/zio/sbt/Versions.scala | 10 +++++----- zio-sbt-githubactions/build.sbt | 2 +- zio-sbt-website/build.sbt | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 9be29ba7..ea65e32f 100644 --- a/README.md +++ b/README.md @@ -172,12 +172,12 @@ In some cases, we may have multiple submodules in our project and we want to tes The `ciTargetScalaVersions` setting key is used to define a mapping of project names to the Scala versions that should be used for testing phase of continuous integration (CI). -For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.11.12` and `2.12.17`, and for the "submoduleB" we want to test it against Scala `2.12.17` and `2.13.10` and `3.2.2`, We can define the `ciTargetScalaVersions` setting as follows: +For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.11.12` and `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.11.12", "2.12.17"), - "submoduleB" -> Seq("2.12.17", "2.13.10", "3.2.2") + "submoduleA" -> Seq("2.11.12", "2.12.18"), + "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") ) ``` @@ -214,10 +214,10 @@ test: - '17' scala-project: - ++2.11.12 submoduleA - - ++2.12.17 submoduleA - - ++2.12.17 submoduleB - - ++2.13.10 submoduleB - - ++3.2.2 submoduleB + - ++2.12.18 submoduleA + - ++2.12.18 submoduleB + - ++2.13.11 submoduleB + - ++3.3.0 submoduleB steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev diff --git a/docs/index.md b/docs/index.md index 1a5fc861..e8815a94 100644 --- a/docs/index.md +++ b/docs/index.md @@ -171,12 +171,12 @@ In some cases, we may have multiple submodules in our project and we want to tes The `ciTargetScalaVersions` setting key is used to define a mapping of project names to the Scala versions that should be used for testing phase of continuous integration (CI). -For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.11.12` and `2.12.17`, and for the "submoduleB" we want to test it against Scala `2.12.17` and `2.13.10` and `3.2.2`, We can define the `ciTargetScalaVersions` setting as follows: +For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.11.12` and `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.11.12", "2.12.17"), - "submoduleB" -> Seq("2.12.17", "2.13.10", "3.2.2") + "submoduleA" -> Seq("2.11.12", "2.12.18"), + "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") ) ``` @@ -213,10 +213,10 @@ test: - '17' scala-project: - ++2.11.12 submoduleA - - ++2.12.17 submoduleA - - ++2.12.17 submoduleB - - ++2.13.10 submoduleB - - ++3.2.2 submoduleB + - ++2.12.18 submoduleA + - ++2.12.18 submoduleB + - ++2.13.11 submoduleB + - ++3.3.0 submoduleB steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev diff --git a/project/Versions.scala b/project/Versions.scala index 13918472..98a8b092 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -1,7 +1,7 @@ object Versions { val Scala211 = "2.11.12" - val Scala212 = "2.12.17" - val Scala213 = "2.13.10" - val Scala3 = "3.2.1" - val zio = "2.0.6" + val Scala212 = "2.12.18" + val Scala213 = "2.13.11" + val Scala3 = "3.3.0" + val zio = "2.0.15" } diff --git a/project/plugins.sbt b/project/plugins.sbt index b4e0bf45..ce641d79 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") // Versioning and Release Plugins @@ -26,8 +26,8 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1") // Benchmarking Plugins -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6" -libraryDependencies += "dev.zio" %% "zio" % "2.0.12" +libraryDependencies += "dev.zio" %% "zio" % "2.0.15" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ci/build.sbt b/zio-sbt-ci/build.sbt index 4d7e652b..fabba6d8 100644 --- a/zio-sbt-ci/build.sbt +++ b/zio-sbt-ci/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "dev.zio" %% "zio" % "2.0.12" +libraryDependencies += "dev.zio" %% "zio" % "2.0.15" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ecosystem/build.sbt b/zio-sbt-ecosystem/build.sbt index 57ebff39..b97a2311 100644 --- a/zio-sbt-ecosystem/build.sbt +++ b/zio-sbt-ecosystem/build.sbt @@ -3,7 +3,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") // Versioning and Release Plugins @@ -26,12 +26,12 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1") // Benchmarking Plugins -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0") // Binary Compatibility Plugin addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6" -libraryDependencies += "dev.zio" %% "zio" % "2.0.12" +libraryDependencies += "dev.zio" %% "zio" % "2.0.15" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala index b681e47f..9051a94a 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala @@ -18,14 +18,14 @@ package zio.sbt object Versions { val KindProjectorVersion = "0.13.2" - val SilencerVersion = "1.7.12" + val SilencerVersion = "1.7.13" val ScaluzziVersion = "0.1.23" val OrganizeImportsVersion = "0.6.0" - val scala3 = "3.2.2" + val scala3 = "3.3.0" val scala211 = "2.11.12" - val scala212 = "2.12.17" - val scala213 = "2.13.10" + val scala212 = "2.12.18" + val scala213 = "2.13.11" - val zioVersion = "2.0.10" + val zioVersion = "2.0.15" } diff --git a/zio-sbt-githubactions/build.sbt b/zio-sbt-githubactions/build.sbt index 4d7e652b..fabba6d8 100644 --- a/zio-sbt-githubactions/build.sbt +++ b/zio-sbt-githubactions/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "dev.zio" %% "zio" % "2.0.12" +libraryDependencies += "dev.zio" %% "zio" % "2.0.15" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-website/build.sbt b/zio-sbt-website/build.sbt index 96b5ed38..7bbdd65e 100644 --- a/zio-sbt-website/build.sbt +++ b/zio-sbt-website/build.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") -libraryDependencies += "dev.zio" %% "zio" % "2.0.12" +libraryDependencies += "dev.zio" %% "zio" % "2.0.15" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2"