From 328dc4ddc92cd704303d577aa36c8b3a63012752 Mon Sep 17 00:00:00 2001
From: Anton Sviridov <anton.sviridov@sourcegraph.com>
Date: Tue, 11 Feb 2025 09:21:47 +0000
Subject: [PATCH] WIP

---
 build.sbt                                                 | 8 ++++----
 .../sourcegraph/scip_java/buildtools/ScipBuildTool.scala  | 4 ++--
 .../sourcegraph/scip_java/commands/CommentSyntax.scala    | 2 +-
 .../scip_java/commands/IndexDependencyCommand.scala       | 2 +-
 .../sourcegraph/scip_java/commands/SnapshotCommand.scala  | 2 +-
 .../scip_java/commands/SnapshotLsifCommand.scala          | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index c2d8860a..8dcbffb7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,11 +17,11 @@ lazy val V =
     val bsp = "2.0.0-M13"
     val moped = "0.2.0"
     val gradle = "7.0"
-    val scala213 = "2.13.13"
-    val scala212 = "2.12.19"
+    val scala213 = "2.13.15"
+    val scala212 = "2.12.20"
     val scala211 = "2.11.12"
     val scala3 = "3.3.3"
-    val metals = "1.2.2"
+    val metals = "1.4.2"
     val scalameta = "4.9.3"
     val semanticdbKotlinc = "0.4.0"
     val testcontainers = "0.39.3"
@@ -565,7 +565,7 @@ val testSettings = List(
   },
   libraryDependencies ++=
     List(
-      "org.scalameta" %% "munit" % "0.7.29",
+      "org.scalameta" %% "munit" % "1.0.2",
       "org.scalameta" %% "mtags" % V.metals cross CrossVersion.full,
       "com.dimafeng" %% "testcontainers-scala-munit" % V.testcontainers,
       "com.dimafeng" %% "testcontainers-scala-postgresql" % V.testcontainers,
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala
index 92726743..3e1fa83a 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala
@@ -798,7 +798,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
           None
       }
     val automatic = moped.macros.deriveCodec(Dependency())
-    implicit lazy val codec =
+    implicit lazy val codec: moped.json.JsonCodec[ScipBuildTool.this.Dependency] =
       new JsonCodec[Dependency] {
         def decode(context: DecodingContext): Result[Dependency] =
           context.json match {
@@ -837,7 +837,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
       kind: String = ""
   )
   private object Config {
-    implicit lazy val codec = moped.macros.deriveCodec(Config())
+    implicit lazy val codec: moped.json.JsonCodec[ScipBuildTool.this.Config] = moped.macros.deriveCodec(Config())
   }
 
 }
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala
index ca47368f..4de88569 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala
@@ -14,5 +14,5 @@ case class CommentSyntax(value: String) {
 }
 object CommentSyntax {
   val default = CommentSyntax("py,# sql,-- yaml,# yml,#")
-  implicit val codec = moped.macros.deriveCodec(default)
+  implicit val codec: moped.json.JsonCodec[com.sourcegraph.scip_java.commands.CommentSyntax] = moped.macros.deriveCodec(default)
 }
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala
index d6a8f710..2739828d 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala
@@ -139,5 +139,5 @@ final case class IndexDependencyCommand(
 }
 
 object IndexDependencyCommand {
-  implicit val parser = CommandParser.derive(IndexDependencyCommand())
+  implicit val parser: moped.cli.CommandParser[IndexDependencyCommand] = CommandParser.derive(IndexDependencyCommand())
 }
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala
index 2f4ffcce..a7bea25c 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala
@@ -92,5 +92,5 @@ case class SnapshotCommand(
 }
 
 object SnapshotCommand {
-  implicit val parser = CommandParser.derive(SnapshotCommand())
+  implicit val parser: moped.cli.CommandParser[SnapshotCommand] = CommandParser.derive(SnapshotCommand())
 }
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala
index a497c7c1..ccea5984 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala
@@ -26,5 +26,5 @@ case class SnapshotLsifCommand(
 
 object SnapshotLsifCommand {
   val default = SnapshotLsifCommand()
-  implicit val parser = CommandParser.derive(default)
+  implicit val parser: moped.cli.CommandParser[SnapshotLsifCommand] = CommandParser.derive(default)
 }