From b0e1a4650f2a6ef25ababf27ac57864d9e7b1b79 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Thu, 24 Oct 2024 09:34:27 +0100
Subject: [PATCH] Bump Scala patch versions

Updated to: 2.11.12, 2.12.20, 2.13.15

JAVA-5649
---
 .evergreen/.evg.yml | 4 ++--
 build.gradle        | 2 +-
 gradle.properties   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
index 2a096161d3b..a57f6473b6f 100644
--- a/.evergreen/.evg.yml
+++ b/.evergreen/.evg.yml
@@ -1857,11 +1857,11 @@ axes:
       - id: "2.12"
         display_name: "Scala 2.12"
         variables:
-          SCALA: "2.12.15"
+          SCALA: "2.12.20"
       - id: "2.13"
         display_name: "Scala 2.13"
         variables:
-          SCALA: "2.13.6"
+          SCALA: "2.13.15"
 
   # Choice of MongoDB storage engine
   - id: storage-engine
diff --git a/build.gradle b/build.gradle
index 88295f763be..e846ea53d93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,7 @@ configure(scalaProjects) {
                     "-feature",
                     "-unchecked",
                     "-language:reflectiveCalls",
-                    "-Wconf:cat=deprecation:ws,any:e",
+                    "-Wconf:cat=deprecation:ws",
                     "-Wconf:msg=While parsing annotations in:silent",
                     "-Xlint:strict-unsealed-patmat"
             ]
diff --git a/gradle.properties b/gradle.properties
index e31c63fbd62..12f1750c442 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,8 @@
 
 org.gradle.daemon=true
 org.gradle.jvmargs=-Duser.country=US -Duser.language=en
-scalaVersions=2.11.12,2.12.15,2.13.6
-defaultScalaVersions=2.13.6
+scalaVersions=2.11.12,2.12.20,2.13.15
+defaultScalaVersions=2.13.15
 runOnceTasks=clean,release
 org.gradle.java.installations.auto-download=false
 org.gradle.java.installations.fromEnv=JDK8,JDK11,JDK17,JDK21,JDK21_GRAALVM