Merge branch 'master' into update/sbt-scalafmt-2.5.4

Author: jxnu-liguobin

.github/workflows/auto-approve.yml

@@ -1,13 +1,13 @@
 name: Auto approve
-
-on:
-  pull_request_target
+on: pull_request_target
 
 jobs:
-  auto-approve:
-    runs-on: ubuntu-22.04
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    if: github.actor == 'renovate[bot]' || github.actor == 'cala-steward-bitlap[bot]'
     steps:
       - uses: hmarr/auto-approve-action@v4
-        if: github.actor == 'scala-steward' || github.actor == 'renovate[bot]'
         with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

.mergify.yml

@@ -1,24 +1,30 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - "-draft"
+    merge_method: merge
+    update_method: rebase
+    
 pull_request_rules:
   - name: assign and label scala-steward's PRs
     conditions:
-      - author=scala-steward
+      - or:
+          - "author=scala-steward"
+          - "author=scala-steward-bitlap[bot]"
+          - "author=renovate[bot]"
     actions:
       assign:
         users: ["@bitlap/intellij-sbt-dependency-analyzer"]
       label:
         add: ["type: dependencies"]
-  - name: label scala-steward's breaking PRs
-    conditions:
-      - author=scala-steward
-      - "body~=(labels: library-update, early-semver-major)|(labels: sbt-plugin-update, early-semver-major)"
-    actions:
-      label:
-        add: ["type: breaking"]
+        
   - name: merge Scala Steward's PRs
     conditions:
-      - author=scala-steward
-      - "body~=(labels: library-update, early-semver-minor)|(labels: library-update, early-semver-patch)|(labels: sbt-plugin-update, early-semver-minor)|(labels: sbt-plugin-update, early-semver-patch)|(labels: test-library-update)"
-      - "check-success=ci"
+      - "check-success=ci"     
+      - or:
+          - "author=scala-steward"
+          - "author=scala-steward-bitlap[bot]"
+          - "author=renovate[bot]"
     actions:
-      merge:
-        method: squash
+      queue:
+        name: default

project/plugins.sbt

@@ -3,6 +3,6 @@ ThisBuild / resolvers ++= Seq(
   "Sonatype OSS Releases" at "https://s01.oss.sonatype.org/content/repositories/releases"
 )
 addSbtPlugin("org.jetbrains" % "sbt-ide-settings"  % "1.1.0")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin"   % "4.0.2")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin"   % "4.0.4")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt"      % "2.5.4")
 addSbtPlugin("org.bitlap"    % "sbt-kotlin-plugin" % "4.0.0")