From e03a3553415d9cc7646f1dcf69e149c2edbf4e1d Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Mon, 11 Mar 2024 15:47:20 +0800 Subject: [PATCH] Update Scala versions (#360) --- README.md | 14 +++++++------- docs/index.md | 14 +++++++------- project/Versions.scala | 6 +++--- .../src/main/scala/zio/sbt/Versions.scala | 6 +++--- .../verifySettingsWithCI/.github/workflows/ci.yml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 5c1652f0..72d6b2b3 100644 --- a/README.md +++ b/README.md @@ -168,12 +168,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.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.12` and `3.3.1`, 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.12.19`, and for the "submoduleB" we want to test it against Scala `2.12.19` and `2.13.13` and `3.3.3`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.12.18"), - "submoduleB" -> Seq("2.12.18", "2.13.12", "3.3.1") + "submoduleA" -> Seq("2.12.19"), + "submoduleB" -> Seq("2.12.19", "2.13.13", "3.3.3") ) ``` @@ -206,10 +206,10 @@ test: matrix: java: ['11', '17', '21'] scala-project: - - ++2.12.18 submoduleA - - ++2.12.18 submoduleB - - ++2.13.12 submoduleB - - ++3.3.1 submoduleB + - ++2.12.19 submoduleA + - ++2.12.19 submoduleB + - ++2.13.13 submoduleB + - ++3.3.3 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 f0d1893b..05c0ea60 100644 --- a/docs/index.md +++ b/docs/index.md @@ -167,12 +167,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.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.12` and `3.3.1`, 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.12.19`, and for the "submoduleB" we want to test it against Scala `2.12.19` and `2.13.13` and `3.3.3`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.12.18"), - "submoduleB" -> Seq("2.12.18", "2.13.12", "3.3.1") + "submoduleA" -> Seq("2.12.19"), + "submoduleB" -> Seq("2.12.19", "2.13.13", "3.3.3") ) ``` @@ -205,10 +205,10 @@ test: matrix: java: ['11', '17', '21'] scala-project: - - ++2.12.18 submoduleA - - ++2.12.18 submoduleB - - ++2.13.12 submoduleB - - ++3.3.1 submoduleB + - ++2.12.19 submoduleA + - ++2.12.19 submoduleB + - ++2.13.13 submoduleB + - ++3.3.3 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 59eb61e3..03da9412 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -1,6 +1,6 @@ object Versions { val Scala212 = "2.12.19" - val Scala213 = "2.13.12" - val Scala3 = "3.3.1" - val zio = "2.0.17" + val Scala213 = "2.13.13" + val Scala3 = "3.3.3" + val zio = "2.0.21" } 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 7e37024d..0a971aa1 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala @@ -22,11 +22,11 @@ object Versions { val KindProjectorVersion = "0.13.3" val ScaluzziVersion = "0.1.23" - val scala3 = "3.3.1" + val scala3 = "3.3.3" val scala212 = "2.12.19" - val scala213 = "2.13.12" + val scala213 = "2.13.13" - val zioVersion = "2.0.17" + val zioVersion = "2.0.21" lazy val betterMonadFor: ModuleID = "com.olegpy" %% "better-monadic-for" % "0.3.1" } diff --git a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml index a953be51..f861c9d0 100644 --- a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml +++ b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: matrix: java: ['11', '17', '21'] # These version must be different than the versions in V.scala to verify that we are reading from the ci.yml file. - scala: ['2.12.19', '2.13.12', '3.3.1' ] + scala: ['2.12.19', '2.13.13', '3.3.3' ] steps: - uses: actions/checkout@v4.1.1 - uses: actions/setup-java@v3.13.0