Skip to content

Commit

Permalink
Update dependencies, sbt plugins, GitHub actions && Drop Scala 2.11 s…
Browse files Browse the repository at this point in the history
…upport && Remove Silencer (#259)

* Update dependencies, sbt plugins && Drop Scala 2.11 support

* Clean

* Add dependabot to help us maintain the CI script

* Remove `setup-scala`

* Update actions

* scalafmt

* clean

* Remove `organize-imports`

* scalafmt
  • Loading branch information
guizmaii authored Aug 29, 2023
1 parent a8f1e87 commit 04ae079
Show file tree
Hide file tree
Showing 23 changed files with 92 additions and 131 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
continue-on-error: true
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: '8'
Expand All @@ -47,13 +47,13 @@ jobs:
continue-on-error: false
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: '8'
Expand All @@ -79,15 +79,15 @@ jobs:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Test
Expand All @@ -99,13 +99,13 @@ jobs:
if: ${{ github.event_name == 'push' }}
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: '8'
Expand Down Expand Up @@ -173,13 +173,13 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: '8'
Expand All @@ -202,13 +202,13 @@ jobs:
if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: '8'
Expand All @@ -233,7 +233,7 @@ jobs:
if: ${{ (github.event_name == 'release') && (github.event.action == 'published') }}
steps:
- name: Git Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: notify the main repo about the new release of docs package
Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ ZIO SBT Ecosystem plugin is an sbt plugin that provides a set of sbt settings an

This pluging provides the following settings with default values:

- scala211
- scala212
- scala213
- scala3

The default values are the latest stable versions of Scala 2.11, 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user.
The default values are the latest stable versions of Scala 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user.

By having these settings, then we can use them in other sbt settings. For example, we can use them to define the `crossScalaVersions` setting:

```scala
crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value)
crossScalaVersions := Seq(scala212.value, scala213.value, scala3.value)
```

There are also some other settings that are useful for configuring the projects:
Expand Down Expand Up @@ -149,15 +148,15 @@ test:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.10.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Test
Expand All @@ -172,11 +171,11 @@ 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.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:
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.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows:

```scala
ThisBuild / ciTargetScalaVersions := Map(
"submoduleA" -> Seq("2.11.12", "2.12.18"),
"submoduleA" -> Seq("2.12.18"),
"submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0")
)
```
Expand Down Expand Up @@ -213,7 +212,6 @@ test:
- '11'
- '17'
scala-project:
- ++2.11.12 submoduleA
- ++2.12.18 submoduleA
- ++2.12.18 submoduleB
- ++2.13.11 submoduleB
Expand All @@ -230,7 +228,7 @@ test:
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Test
Expand Down
16 changes: 7 additions & 9 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,16 @@ ZIO SBT Ecosystem plugin is an sbt plugin that provides a set of sbt settings an

This pluging provides the following settings with default values:

- scala211
- scala212
- scala213
- scala3

The default values are the latest stable versions of Scala 2.11, 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user.
The default values are the latest stable versions of Scala 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user.

By having these settings, then we can use them in other sbt settings. For example, we can use them to define the `crossScalaVersions` setting:

```scala
crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value)
crossScalaVersions := Seq(scala212.value, scala213.value, scala3.value)
```

There are also some other settings that are useful for configuring the projects:
Expand Down Expand Up @@ -148,15 +147,15 @@ test:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.10.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Test
Expand All @@ -171,11 +170,11 @@ 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.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:
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.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows:

```scala
ThisBuild / ciTargetScalaVersions := Map(
"submoduleA" -> Seq("2.11.12", "2.12.18"),
"submoduleA" -> Seq("2.12.18"),
"submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0")
)
```
Expand Down Expand Up @@ -212,7 +211,6 @@ test:
- '11'
- '17'
scala-project:
- ++2.11.12 submoduleA
- ++2.12.18 submoduleA
- ++2.12.18 submoduleB
- ++2.13.11 submoduleB
Expand All @@ -229,7 +227,7 @@ test:
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.6.0
with:
fetch-depth: '0'
- name: Test
Expand Down
3 changes: 1 addition & 2 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
object Versions {
val Scala211 = "2.11.12"
val Scala212 = "2.12.18"
val Scala213 = "2.13.11"
val Scala3 = "3.3.0"
val zio = "2.0.15"
val zio = "2.0.16"
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.4
18 changes: 9 additions & 9 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Build Server Plugins
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.10")

// Linting Plugins
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")

// Versioning and Release Plugins
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

// Docs Plugins
Expand All @@ -19,15 +19,15 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

// Cross-Compiler Plugins
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0")
addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2")

// Benchmarking Plugins
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6"
libraryDependencies += "dev.zio" %% "zio" % "2.0.15"
libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.7"
libraryDependencies += "dev.zio" %% "zio" % "2.0.16"
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.15"
libraryDependencies += "dev.zio" %% "zio" % "2.0.16"
libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2"
4 changes: 2 additions & 2 deletions zio-sbt-ci/src/main/scala/zio/sbt/V.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ object V {
"peter-evans/create-pull-request" -> "v5.0.0",
"zio/generate-github-app-token" -> "v1.0.0",
"pierotofy/set-swap-space" -> "master",
"actions/checkout" -> "v3.5.0",
"actions/setup-java" -> "v3.11.0",
"actions/checkout" -> "v3.6.0",
"actions/setup-java" -> "v3.12.0",
"coursier/cache-action" -> "v6",
"actions/setup-node" -> "v3"
).map { case (k, v) => (k, s"$k@$v") }.apply(packageName)
Expand Down
20 changes: 10 additions & 10 deletions zio-sbt-ecosystem/build.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Build Server Plugins
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.10")

// Linting Plugins
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")

// Versioning and Release Plugins
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

// Docs Plugins
Expand All @@ -19,19 +19,19 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

// Cross-Compiler Plugins
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0")
addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2")

// Benchmarking Plugins
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")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6"
libraryDependencies += "dev.zio" %% "zio" % "2.0.15"
libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.7"
libraryDependencies += "dev.zio" %% "zio" % "2.0.16"
libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2"
Loading

0 comments on commit 04ae079

Please sign in to comment.