Merge branch 'main' into update/sbt-mima-plugin-1.1.3

zio · Sep 10, 2023 · 26df7c1 · 26df7c1
2 parents 4c878f2 + 93c2115
commit 26df7c1
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 149 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,13 +22,13 @@ jobs:
     continue-on-error: true
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.5.0
+      uses: actions/checkout@v4.0.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'
@@ -47,13 +47,13 @@ jobs:
     continue-on-error: false
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.5.0
+      uses: actions/checkout@v4.0.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'
@@ -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@v4.0.0
       with:
         fetch-depth: '0'
     - name: Test
@@ -99,13 +99,13 @@ jobs:
     if: ${{ github.event_name == 'push' }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.5.0
+      uses: actions/checkout@v4.0.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'
@@ -173,13 +173,13 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.5.0
+      uses: actions/checkout@v4.0.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'
@@ -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@v4.0.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'
@@ -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@v4.0.0
       with:
         fetch-depth: '0'
     - name: notify the main repo about the new release of docs package

diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ _ZIO SBT_ contains multiple sbt plugins that are useful for ZIO projects. It pro
 Add the following lines to your `plugin.sbt` file:
 
 ```scala
-addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % "0.4.0-alpha.14")
-addSbtPlugin("dev.zio" % "zio-sbt-ci"        % "0.4.0-alpha.14")
-addSbtPlugin("dev.zio" % "zio-sbt-website"   % "0.4.0-alpha.14")
+addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % "0.4.0-alpha.17")
+addSbtPlugin("dev.zio" % "zio-sbt-ci"        % "0.4.0-alpha.17")
+addSbtPlugin("dev.zio" % "zio-sbt-website"   % "0.4.0-alpha.17")
 ```
 
 Then you can enable them by using the following code in your `build.sbt` file:
@@ -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:
@@ -99,7 +98,7 @@ ZIO SBT CI plugin generates a default GitHub workflow that includes common CI ta
 To use ZIO SBT CI plugin, add the following lines to your `plugins.sbt` file:
 
 ```scala
-addSbtPlugin("dev.zio" % "zio-sbt-ci" % "0.4.0-alpha.14")
+addSbtPlugin("dev.zio" % "zio-sbt-ci" % "0.4.0-alpha.17")
 
 resolvers ++= Resolver.sonatypeOssRepos("public")
 ```
@@ -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@v4.0.0
     with:
       fetch-depth: '0'
   - name: Test
@@ -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")
   )
 ```
@@ -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
@@ -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@v4.0.0
     with:
       fetch-depth: '0'
   - name: Test

diff --git a/docs/index.md b/docs/index.md
@@ -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:
@@ -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@v4.0.0
     with:
       fetch-depth: '0'
   - name: Test
@@ -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")
   )
 ```
@@ -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
@@ -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@v4.0.0
     with:
       fetch-depth: '0'
   - name: Test

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -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"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,33 +1,30 @@
 // Build Server Plugins
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.11")
 
 // Linting Plugins
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"              % "2.5.0")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"              % "2.5.2")
 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("com.geirsson"   % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 // Docs Plugins
 addSbtPlugin("org.scalameta"     % "sbt-mdoc"   % "2.3.7")
 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"
diff --git a/zio-sbt-ci/build.sbt b/zio-sbt-ci/build.sbt
@@ -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"
diff --git a/zio-sbt-ci/src/main/scala/zio/sbt/V.scala b/zio-sbt-ci/src/main/scala/zio/sbt/V.scala
@@ -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"                -> "v4.0.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)

diff --git a/zio-sbt-ecosystem/build.sbt b/zio-sbt-ecosystem/build.sbt
@@ -1,29 +1,26 @@
 // Build Server Plugins
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.11")
 
 // Linting Plugins
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"              % "2.5.0")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"              % "2.5.2")
 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("com.geirsson"   % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 // Docs Plugins
 addSbtPlugin("org.scalameta"     % "sbt-mdoc"   % "2.3.7")
 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")
@@ -32,6 +29,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0")
 // Binary Compatibility Plugin
 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"