Merge branch 'master' into update/sbt-updates-0.6.3

geirolz · Aug 8, 2022 · 7fa0b07 · 7fa0b07
2 parents f941c73 + c8a4a54
commit 7fa0b07
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 19 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -36,17 +36,18 @@ jobs:
             test-tasks: test # scoverage doesn’t support Scala 3
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       #----------- JDK -----------
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Setup JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: "liberica"
+          java-version: 17
 
       #----------- CACHE -----------
       - name: Cache SBT
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.6
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |
@@ -74,17 +75,18 @@ jobs:
     needs: [build]
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       #----------- JDK -----------
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Setup JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: "liberica"
+          java-version: 17
 
       #----------- CACHE -----------
       - name: Cache SBT
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.6
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |
@@ -95,4 +97,4 @@ jobs:
 
       #----------- RELEASE -----------
       - name: Release
-        run: sbt clean compile ci-release
+        run: sbt clean compile ci-release
diff --git a/.mergify.yml b/.mergify.yml
@@ -7,11 +7,11 @@ pull_request_rules:
       - check-success=build (Scala2-12)
       - check-success=build (Scala2-13)
       - check-success=build (Scala3)
-      - base=master
+      - base=main
       - label!=work-in-progress
     actions:
       merge:
-        method: merge
+        method: rebase
         priority: high
   - name: automatic merge for master when CI passes and author is steward
     conditions:
@@ -21,8 +21,26 @@ pull_request_rules:
       - check-success=build (Scala2-12)
       - check-success=build (Scala2-13)
       - check-success=build (Scala3)
-      - base=master
+      - base=main
     actions:
       merge:
-        method: merge
+        method: rebase
         priority: medium
+  - name: automatic merge for master when CI passes and author is dependabot
+    conditions:
+      - author=dependabot[bot]
+      - check-success=codecov/patch
+      - check-success=codecov/project
+      - check-success=build (Scala2-12)
+      - check-success=build (Scala2-13)
+      - check-success=build (Scala3)
+      - base=main
+    actions:
+      merge:
+        method: rebase
+        priority: medium     
+
+
+
+
+
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,10 +13,10 @@ object Dependencies {
     // XML
     "org.scala-lang.modules" %% "scala-xml" % "2.1.0" cross CrossVersion.binary,
     // TEST
-    "org.scalactic"  %% "scalactic"            % "3.2.12" % Test cross CrossVersion.binary,
+    "org.scalactic"  %% "scalactic"            % "3.2.13" % Test cross CrossVersion.binary,
     "org.typelevel"  %% "discipline-scalatest" % "2.1.5"  % Test,
     "org.typelevel"  %% "cats-laws"            % "2.7.0"  % Test cross CrossVersion.binary,
-    "org.scalatest"  %% "scalatest"            % "3.2.12" % Test cross CrossVersion.binary,
+    "org.scalatest"  %% "scalatest"            % "3.2.13" % Test cross CrossVersion.binary,
     "org.scalacheck" %% "scalacheck"           % "1.15.4" % Test cross CrossVersion.binary
   )
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.9.3")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "2.0.1")
 addSbtPlugin("com.github.sbt"   % "sbt-ci-release"       % "1.5.10")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates"          % "0.6.3")
 addSbtPlugin("org.scalameta"    % "sbt-scalafmt"         % "2.4.6")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
-addSbtPlugin("org.scalameta"    % "sbt-mdoc"             % "2.3.2")
+addSbtPlugin("org.scalameta"    % "sbt-mdoc"             % "2.3.3")