Skip to content

Commit

Permalink
Update Scala, scalafix and ZIO versions (#232)
Browse files Browse the repository at this point in the history
* Update Scala, scalafix and ZIO versions

* trigger CI
  • Loading branch information
guizmaii authored Jun 12, 2023
1 parent 860094f commit 9550691
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 32 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
```

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
```

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion zio-sbt-ci/build.sbt
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions zio-sbt-ecosystem/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
10 changes: 5 additions & 5 deletions zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion zio-sbt-githubactions/build.sbt
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion zio-sbt-website/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 9550691

Please sign in to comment.