From 9c124d0b10547436e5dd255a129d1e507028a4b9 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 10 Dec 2024 23:29:49 -0500
Subject: [PATCH] Update to Scala 3.6.2

---
 build.sbt                                    | 3 +++
 project/Dependencies.scala                   | 2 +-
 sbt-app/src/sbt-test/actions/doc-scala3/test | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index d59ff871f..8975d648a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -51,6 +51,8 @@ Global / semanticdbVersion := "4.9.9"
 Global / excludeLintKeys += Utils.componentID
 Global / excludeLintKeys += scriptedBufferLog
 Global / excludeLintKeys += checkPluginCross
+Global / excludeLintKeys += nativeImageVersion
+Global / excludeLintKeys += nativeImageJvm
 ThisBuild / evictionErrorLevel := Level.Info
 
 def commonSettings: Seq[Setting[_]] = Def.settings(
@@ -686,6 +688,7 @@ lazy val protocolProj = (project in file("protocol"))
     testedBaseSettings,
     name := "Protocol",
     libraryDependencies ++= Seq(sjsonNewScalaJson.value, sjsonNewCore.value, ipcSocket),
+    Compile / scalacOptions += "-source:3.7",
     Compile / managedSourceDirectories +=
       baseDirectory.value / "src" / "main" / "contraband-scala",
     Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala",
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c62faeb4e..70038c8b5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   // WARNING: Please Scala update versions in PluginCross.scala too
   val scala212 = "2.12.20"
   val scala213 = "2.13.15"
-  val scala3 = "3.5.2"
+  val scala3 = "3.6.2"
   val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
   val baseScalaVersion = scala3
   def nightlyVersion: Option[String] =
diff --git a/sbt-app/src/sbt-test/actions/doc-scala3/test b/sbt-app/src/sbt-test/actions/doc-scala3/test
index eb5f3f767..da955e938 100644
--- a/sbt-app/src/sbt-test/actions/doc-scala3/test
+++ b/sbt-app/src/sbt-test/actions/doc-scala3/test
@@ -2,6 +2,6 @@
 
 # there shouldn't be two api/ directories
 # see https://github.com/lampepfl/dotty/issues/11412
-$ exists target/out/jvm/scala-3.5.2/a/api/index.html
-$ exists target/out/jvm/scala-3.5.2/a/api/foo/A$.html
-$ exists target/out/jvm/scala-3.5.2/a/api/foo.html
+$ exists target/**/a/api/index.html
+$ exists target/**/a/api/foo/A$.html
+$ exists target/**/a/api/foo.html