Skip to content

Commit e9fa40f

Browse files
committed
Migrate integration tests to Scala 3
1 parent 8b45736 commit e9fa40f

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
@@ -993,13 +993,13 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
993993
with ScalaCliScalafixModule {
994994
override def scalaVersion: T[String] = sv
995995

996-
def sv: String = Scala.scala213
996+
def sv: String = Scala.scala3Lts
997997

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

10051005
override def ivyDeps: T[Agg[Dep]] = super.ivyDeps() ++ Agg(
@@ -1015,7 +1015,6 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
10151015
Deps.jsoniterCore,
10161016
Deps.libsodiumjni,
10171017
Deps.pprint,
1018-
Deps.scalaAsync,
10191018
Deps.slf4jNop,
10201019
Deps.usingDirectives
10211020
)
@@ -1252,7 +1251,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
12521251
}
12531252

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

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)