Address some deprecations

almond-sh · Feb 22, 2024 · 95fe192 · 95fe192
1 parent 68626e4
commit 95fe192
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/build.sc b/build.sc
@@ -390,6 +390,7 @@ trait CoursierLogger extends Cross.Module[String] with AlmondModule {
     shared.logger()
   )
   def ivyDeps = super.ivyDeps() ++ Agg(
+    Deps.collectionCompat,
     Deps.coursierApi,
     Deps.scalatags.applyBinaryVersion213_3(scalaVersion())
   )

diff --git a/modules/scala/coursier-logger/src/main/scala/almond/cslogger/NotebookCacheLogger.scala b/modules/scala/coursier-logger/src/main/scala/almond/cslogger/NotebookCacheLogger.scala
@@ -7,7 +7,7 @@ import java.lang.{Long => JLong}
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class NotebookCacheLogger(
   publish: OutputHandler,

diff --git a/modules/scala/integration/src/main/scala/almond/integration/KernelLauncher.scala b/modules/scala/integration/src/main/scala/almond/integration/KernelLauncher.scala
@@ -216,7 +216,7 @@ class KernelLauncher(
 
   private def stackTracePrinterThread(output: TestOutput): Thread =
     new Thread("stack-trace-printer") {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       setDaemon(true)
       override def run(): Unit =
         try {

diff --git a/...es/scala/scala-interpreter/src/main/scala-2/almond/internals/AlmondMetabrowseServer.scala b/...es/scala/scala-interpreter/src/main/scala-2/almond/internals/AlmondMetabrowseServer.scala
@@ -12,9 +12,9 @@ import ammonite.runtime.Frame
 import ammonite.util.Util.newLine
 import metabrowse.server.{MetabrowseServer, Sourcepath}
 
-import scala.collection.JavaConverters._
 import scala.collection.compat._
 import scala.collection.mutable
+import scala.jdk.CollectionConverters._
 import scala.meta.dialects
 import scala.tools.nsc.interactive.{Global => Interactive}
 import scala.util.Random

diff --git a/...ala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala b/...ala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala
@@ -17,8 +17,8 @@ import scala.meta.pc.SymbolDocumentation
 
 import java.util.Optional
 
-import scala.collection.JavaConverters._
 import scala.collection.compat._
+import scala.jdk.CollectionConverters._
 import scala.tools.nsc.interactive.{Global => Interactive}
 
 final class ScalaInterpreterInspections(

diff --git a/modules/scala/scala-interpreter/src/test/scala/almond/ScalaKernelTests.scala b/modules/scala/scala-interpreter/src/test/scala/almond/ScalaKernelTests.scala
@@ -22,8 +22,8 @@ import cats.effect.IO
 import fs2.Stream
 import utest._
 
-import scala.collection.JavaConverters._
 import scala.collection.compat._
+import scala.jdk.CollectionConverters._
 
 object ScalaKernelTests extends TestSuite {
 

diff --git a/modules/scala/scala-interpreter/src/test/scala/almond/TestUtil.scala b/modules/scala/scala-interpreter/src/test/scala/almond/TestUtil.scala
@@ -19,6 +19,7 @@ import fs2.Stream
 import java.nio.charset.StandardCharsets
 import java.nio.file.Paths
 
+import scala.collection.compat._
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
@@ -374,7 +375,7 @@ object TestUtil {
       for (k <- expectedReplies.keySet.--(replies0.keySet))
         System.err.println(s"At line $k: expected ${expectedReplies(k)}, got nothing")
 
-      expect(replies0.mapValues(noCrLf).toMap == expectedReplies.mapValues(noCrLf).toMap)
+      expect(replies0.view.mapValues(noCrLf).toMap == expectedReplies.view.mapValues(noCrLf).toMap)
       expect(publish0.map(noCrLf) == publish.map(noCrLf))
     }
   }

diff --git a/modules/scala/test-definitions/src/main/scala/almond/integration/Tests.scala b/modules/scala/test-definitions/src/main/scala/almond/integration/Tests.scala
@@ -10,7 +10,7 @@ import com.eed3si9n.expecty.Expecty.expect
 import java.io.File
 import java.util.UUID
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.Properties
 
 object Tests {