Skip to content

Commit 863bec3

Browse files
authored
Migrate integration tests to Scala 3 (#3926)
1 parent bdaf5d8 commit 863bec3

File tree

56 files changed

+593
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+593
-546
lines changed

build.mill.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -994,13 +994,13 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
994994
with ScalaCliScalafixModule {
995995
override def scalaVersion: T[String] = sv
996996

997-
def sv: String = Scala.scala213
997+
def sv: String = Scala.scala3Lts
998998

999999
def tmpDirBase: T[PathRef] = Task(persistent = true) {
10001000
PathRef(Task.dest / "working-dir")
10011001
}
10021002
override def scalacOptions: T[Seq[String]] = Task {
1003-
super.scalacOptions() ++ Seq("-Xasync", "-deprecation")
1003+
super.scalacOptions() ++ Seq("-deprecation")
10041004
}
10051005

10061006
override def ivyDeps: T[Agg[Dep]] = super.ivyDeps() ++ Agg(
@@ -1016,7 +1016,6 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
10161016
Deps.jsoniterCore,
10171017
Deps.libsodiumjni,
10181018
Deps.pprint,
1019-
Deps.scalaAsync,
10201019
Deps.slf4jNop,
10211020
Deps.usingDirectives
10221021
)
@@ -1253,7 +1252,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
12531252
}
12541253

12551254
trait CliIntegrationDocker extends SbtModule with ScalaCliPublishModule with HasTests {
1256-
override def scalaVersion: T[String] = Scala.scala213
1255+
override def scalaVersion: T[String] = Scala.scala3Lts
12571256
override def ivyDeps: T[Agg[Dep]] = super.ivyDeps() ++ Agg(
12581257
Deps.osLib
12591258
)

modules/integration/src/test/scala/scala/cli/integration/BspSuite.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package scala.cli.integration
22

3-
import ch.epfl.scala.{bsp4j => b}
3+
import ch.epfl.scala.bsp4j as b
44
import com.eed3si9n.expecty.Expecty.expect
5-
import com.github.plokhotnyuk.jsoniter_scala.core._
6-
import com.github.plokhotnyuk.jsoniter_scala.macros._
5+
import com.github.plokhotnyuk.jsoniter_scala.core.*
6+
import com.github.plokhotnyuk.jsoniter_scala.macros.*
77
import com.google.gson.Gson
88
import com.google.gson.internal.LinkedTreeMap
99
import org.eclipse.lsp4j.jsonrpc.messages.ResponseError
@@ -14,13 +14,13 @@ import java.util.concurrent.{ExecutorService, ScheduledExecutorService}
1414
import scala.annotation.tailrec
1515
import scala.cli.integration.BspSuite.{Details, detailsCodec}
1616
import scala.concurrent.ExecutionContext.Implicits.global
17-
import scala.concurrent.duration._
17+
import scala.concurrent.duration.*
1818
import scala.concurrent.{Await, Future, Promise}
19-
import scala.jdk.CollectionConverters._
19+
import scala.jdk.CollectionConverters.*
2020
import scala.util.control.NonFatal
2121
import scala.util.{Failure, Success, Try}
2222

23-
trait BspSuite { _: ScalaCliSuite =>
23+
trait BspSuite { this: ScalaCliSuite =>
2424
protected def extraOptions: Seq[String]
2525
def initParams(root: os.Path): b.InitializeBuildParams =
2626
new b.InitializeBuildParams(

0 commit comments

Comments
 (0)