From ce74b15cb2cccd361a8f98ea300d0c3384c37097 Mon Sep 17 00:00:00 2001
From: Michel Davit <michel@davit.fr>
Date: Mon, 6 Jan 2025 10:36:24 +0100
Subject: [PATCH] Update sbt to 1.10.7 and 2.0.0-M3

---
 .github/workflows/ci.yml                               | 10 +++++-----
 build.sbt                                              |  8 ++++----
 .../src/main/scala/com/github/sbt/avro/SbtAvro.scala   |  6 +++---
 plugin/src/sbt-test/sbt-avro/basic/build.sbt           |  2 +-
 project/build.properties                               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index faaf3e7..89378c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.4, 2.12.20]
+        scala: [3.6.2, 2.12.20]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.4]
+        scala: [3.6.2]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -88,12 +88,12 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Download target directories (3.3.4)
+      - name: Download target directories (3.6.2)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.6.2-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.4)
+      - name: Inflate target directories (3.6.2)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/build.sbt b/build.sbt
index 5167c56..7bd4c33 100644
--- a/build.sbt
+++ b/build.sbt
@@ -30,7 +30,7 @@ ThisBuild / developers := List(
 )
 
 // sbt-github-actions
-lazy val scala3 = "3.3.4"
+lazy val scala3 = "3.6.2"
 lazy val scala212 = "2.12.20"
 ThisBuild / scalaVersion := scala3
 ThisBuild / crossScalaVersions := Seq(scala3, scala212)
@@ -106,13 +106,13 @@ lazy val `sbt-avro`: Project = project
     (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.0"
-        case _      => "2.0.0-M2"
+        case _      => "2.0.0-M3"
       }
     },
     scriptedSbt := {
       scalaBinaryVersion.value match {
-        case "2.12" => "1.10.3"
-        case _      => "2.0.0-M2"
+        case "2.12" => "1.10.7"
+        case _      => "2.0.0-M3"
       }
     },
     buildInfoKeys := Seq[BuildInfoKey](name, version),
diff --git a/plugin/src/main/scala/com/github/sbt/avro/SbtAvro.scala b/plugin/src/main/scala/com/github/sbt/avro/SbtAvro.scala
index abb7d97..6c0bc85 100644
--- a/plugin/src/main/scala/com/github/sbt/avro/SbtAvro.scala
+++ b/plugin/src/main/scala/com/github/sbt/avro/SbtAvro.scala
@@ -51,7 +51,7 @@ object SbtAvro extends AutoPlugin {
     lazy val avroArtifactTasks: Seq[TaskKey[FileRef]] =
       Seq(Compile, Test).map(conf => conf / packageAvro)
 
-    lazy val defaultSettings: Seq[Setting[_]] = Seq(
+    lazy val defaultSettings: Seq[Setting[?]] = Seq(
       // compiler
       avroCompiler := "com.github.sbt.avro.AvroCompilerBridge",
       avroCreateSetters := true,
@@ -78,7 +78,7 @@ object SbtAvro extends AutoPlugin {
     )
 
     // settings to be applied for both Compile and Test
-    lazy val configScopedSettings: Seq[Setting[_]] = Seq(
+    lazy val configScopedSettings: Seq[Setting[?]] = Seq(
       avroSource := sourceDirectory.value / "avro",
       avroUnmanagedSourceDirectories := Seq(avroSource.value),
       avroSpecificRecords := Seq.empty,
@@ -125,7 +125,7 @@ object SbtAvro extends AutoPlugin {
 
   override def projectConfigurations: Seq[Configuration] = Seq(Avro)
 
-  override lazy val projectSettings: Seq[Setting[_]] = defaultSettings ++
+  override lazy val projectSettings: Seq[Setting[?]] = defaultSettings ++
     inConfig(Avro)(Defaults.configSettings) ++
     Seq(Compile, Test).flatMap(c => inConfig(c)(configScopedSettings))
 
diff --git a/plugin/src/sbt-test/sbt-avro/basic/build.sbt b/plugin/src/sbt-test/sbt-avro/basic/build.sbt
index fb58aae..21d4fa6 100644
--- a/plugin/src/sbt-test/sbt-avro/basic/build.sbt
+++ b/plugin/src/sbt-test/sbt-avro/basic/build.sbt
@@ -1,7 +1,7 @@
 ThisBuild / scalaVersion := "2.13.11"
 
 lazy val files = Seq(
-  "A", "B", "C", "D", "E", "_A", "_B", "_C", "_D", "_E", "LogicalTypesTest"
+  "A", "B", "C", "D", "E", "_A", "_B", "_C", "_D", "_E", "LogicalTypesTest", "LocalDateTimeTest"
 )
 
 lazy val testFiles = Seq(
diff --git a/project/build.properties b/project/build.properties
index e88a0d8..73df629 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.10.7