Merge branch 'main' into issue-2519-gitlab-minimum-reviewers

Author: exoego

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.16, 2.13.8]
+        scala: [2.12.17, 2.13.10]
         java: [adopt-hotspot@8, adopt-hotspot@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -118,22 +118,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.16)
+      - name: Download target directories (2.12.17)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.16-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.16)
+      - name: Inflate target directories (2.12.17)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.8)
+      - name: Download target directories (2.13.10)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.8)
+      - name: Inflate target directories (2.13.10)
         run: |
           tar xf targets.tar
           rm targets.tar

.mergify.yml

@@ -10,10 +10,10 @@ pull_request_rules:
   - name: merge scala-steward's PRs
     conditions:
       - author=scala-steward
-      - status-success=Build and Test (ubuntu-latest, 2.12.16, adopt-hotspot@8)
-      - status-success=Build and Test (ubuntu-latest, 2.12.16, adopt-hotspot@11)
-      - status-success=Build and Test (ubuntu-latest, 2.13.8, adopt-hotspot@8)
-      - status-success=Build and Test (ubuntu-latest, 2.13.8, adopt-hotspot@11)
+      - status-success=Build and Test (ubuntu-latest, 2.12.17, adopt-hotspot@8)
+      - status-success=Build and Test (ubuntu-latest, 2.12.17, adopt-hotspot@11)
+      - status-success=Build and Test (ubuntu-latest, 2.13.10, adopt-hotspot@8)
+      - status-success=Build and Test (ubuntu-latest, 2.13.10, adopt-hotspot@11)
     actions:
       merge:
         method: squash

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.5.8
+version = 3.5.9
 runner.dialect = scala213
 assumeStandardLibraryStripMargin = true
 align.openParenCallSite = false

build.sbt

@@ -20,8 +20,8 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
   "mill-plugin" -> List(JVMPlatform)
 )
 
-val Scala212 = "2.12.16"
-val Scala213 = "2.13.8"
+val Scala212 = "2.12.17"
+val Scala213 = "2.13.10"
 
 /// sbt-github-actions configuration
 
@@ -138,6 +138,11 @@ lazy val core = myCrossProject("core")
         // https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.12.6/jackson-core-2.12.6.jar:module-info.class
         // https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.12.6.1/jackson-databind-2.12.6.1.jar:module-info.class
         MergeStrategy.discard
+      case PathList("META-INF", "sisu", "javax.inject.Named") =>
+        // (core / assembly) deduplicate: different file contents found in the following:
+        // https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-archiver/4.5.0/plexus-archiver-4.5.0.jar:META-INF/sisu/javax.inject.Named
+        // https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-io/3.4.0/plexus-io-3.4.0.jar:META-INF/sisu/javax.inject.Named
+        MergeStrategy.first
       case otherwise =>
         val defaultStrategy = (assembly / assemblyMergeStrategy).value
         defaultStrategy(otherwise)

docs/help.md

@@ -3,7 +3,9 @@
 All command line arguments for the `scala-steward` application.
 
 ```
-Usage: scala-steward --workspace <file> --repos-file <file> [--git-author-name <string>] --git-author-email <string> [--git-author-signing-key <string>] --git-ask-pass <file> [--sign-commits] [--vcs-type <vcs-type>] [--vcs-api-host <uri>] --vcs-login <string> [--do-not-fork] [--add-labels] [--ignore-opts-files] [--env-var <name=value>]... [--process-timeout <duration>] [--whitelist <string>]... [--read-only <string>]... [--enable-sandbox | --disable-sandbox] [--max-buffer-size <integer>] [--repo-config <uri>]... [--disable-default-repo-config] [--scalafix-migrations <uri>]... [--disable-default-scalafix-migrations] [--artifact-migrations <uri>]... [--disable-default-artifact-migrations] [--cache-ttl <duration>] [--bitbucket-server-use-default-reviewers] [--gitlab-merge-when-pipeline-succeeds] [--gitlab-required-reviewers <integer>] [--github-app-id <integer> --github-app-key-file <file>] [--url-checker-test-url <uri>] [--default-maven-repo <string>] [--refresh-backoff-period <duration>]
+Usage:
+    scala-steward validate-repo-config
+    scala-steward --workspace <file> --repos-file <file> [--git-author-name <string>] --git-author-email <string> [--git-author-signing-key <string>] --git-ask-pass <file> [--sign-commits] [--vcs-type <vcs-type>] [--vcs-api-host <uri>] --vcs-login <string> [--do-not-fork] [--add-labels] [--ignore-opts-files] [--env-var <name=value>]... [--process-timeout <duration>] [--whitelist <string>]... [--read-only <string>]... [--enable-sandbox | --disable-sandbox] [--max-buffer-size <integer>] [--repo-config <uri>]... [--disable-default-repo-config] [--scalafix-migrations <uri>]... [--disable-default-scalafix-migrations] [--artifact-migrations <uri>]... [--disable-default-artifact-migrations] [--cache-ttl <duration>] [--bitbucket-server-use-default-reviewers] [--gitlab-merge-when-pipeline-succeeds] [--gitlab-required-reviewers <integer>] [--github-app-id <integer> --github-app-key-file <file>] [--url-checker-test-url <uri>] [--default-maven-repo <string>] [--refresh-backoff-period <duration>]
 
 
 
@@ -70,6 +72,7 @@ Options and flags:
         Whether to merge a gitlab merge request when the pipeline succeeds
     --gitlab-required-reviewers <integer>
         When set, the number of required reviewers for a merge request will be set to this number (non-negative integer).  Is only used in the context of gitlab-merge-when-pipeline-succeeds being enabled, and requires that the configured access token have the appropriate privileges.
+    --gitlab-required-reviewers <integer>
     --github-app-id <integer>
         GitHub application id
     --github-app-key-file <file>
@@ -80,4 +83,8 @@ Options and flags:
         default: https://repo1.maven.org/maven2/
     --refresh-backoff-period <duration>
         Period of time a failed build won't be triggered again; default: 0days
+
+Subcommands:
+    validate-repo-config
+        Validate the repo config file and exit; report errors if any
 ```

modules/core/src/main/resources/artifact-migrations.v2.conf

@@ -473,5 +473,20 @@ changes = [
     groupIdAfter = io.janstenpickle
     artifactIdBefore = trace4cats-dynamic-sampling
     artifactIdAfter = trace4cats-core
+  },
+  {
+    groupIdBefore = com.free2move
+    groupIdAfter = org.gnieh
+    artifactIdAfter = geo-scala-core
+  },
+  {
+    groupIdBefore = com.free2move
+    groupIdAfter = org.gnieh
+    artifactIdAfter = geo-scala-circe
+  },
+  {
+    groupIdBefore = com.free2move
+    groupIdAfter = org.gnieh
+    artifactIdAfter = geo-scala-polyline
   }
 ]