Merge branch 'master' into update/scala-library-2.12.18

cornerman · Aug 6, 2023 · 6957c26 · 6957c26
2 parents ba1ee19 + aae7b9b
commit 6957c26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,7 +2,7 @@ queue_rules:
   - name: default
     conditions:
       # Conditions to get out of the queue (= merged)
-      - check-success~=build \(2.12.\d+\)
+      - check-success~=build \(3.3.\d+\)
       - check-success~=build \(2.13.\d+\)
 
 pull_request_rules:
@@ -16,7 +16,7 @@ pull_request_rules:
     conditions:
       - base=master
       - author=scala-steward
-      - check-success~=build \(2.12.\d+\)
+      - check-success~=build \(3.3.\d+\)
       - check-success~=build \(2.13.\d+\)
     actions:
       queue:

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.3