Segregate scala2-interop-tests and add to CI

.github/workflows/ci.yaml

@@ -93,7 +93,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;configureIDE"
+          ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;scala2-interop-tests/scripted ;configureIDE"
           ./project/scripts/bootstrapCmdTests
 
 

build.sbt

@@ -27,6 +27,7 @@ val `scala-reflect` = Build.`scala-reflect`
 val scalap = Build.scalap
 val dist = Build.dist
 val `community-build` = Build.`community-build`
+val `scala2-interop-tests` = Build.`scala2-interop-tests`
 
 val sjsSandbox = Build.sjsSandbox
 val sjsJUnitTests = Build.sjsJUnitTests

project/Build.scala

@@ -1126,6 +1126,39 @@ object Build {
       libraryDependencies := Seq("org.scala-lang" % "scalap" % stdlibVersion(Bootstrapped))
     )
 
+  lazy val `scala2-interop-tests` = project.in(file("tests/scala2-interop")).
+    enablePlugins(SbtPlugin).
+    settings(commonSettings).
+    settings(
+      sbtTestDirectory := baseDirectory.value / "sbt-test",
+      scriptedLaunchOpts ++= Seq(
+        "-Dplugin.version=" + sbtDottyVersion,
+        "-Dplugin.scalaVersion=" + dottyVersion,
+        "-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
+        "-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
+      ),
+      // Pass along ivy home and repositories settings to sbt instances run from the tests
+      scriptedLaunchOpts ++= {
+        val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath
+        s"-Dsbt.repository.config=$repositoryPath" ::
+        ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList
+      },
+      scriptedBufferLog := true,
+      scripted := scripted.dependsOn(
+        publishLocal in `dotty-sbt-bridge`,
+        publishLocal in `dotty-interfaces`,
+        publishLocal in `dotty-compiler-bootstrapped`,
+        publishLocal in `dotty-library-bootstrapped`,
+        publishLocal in `dotty-library-bootstrappedJS`,
+        publishLocal in `tasty-core-bootstrapped`,
+        publishLocal in `dotty-tasty-inspector`,
+        publishLocal in `scala-library`,
+        publishLocal in `scala-reflect`,
+        publishLocal in `dotty-doc-bootstrapped`,
+        publishLocal in `dotty-bootstrapped`,
+        publishLocal in `sbt-dotty`
+      ).evaluated
+    )
 
   // sbt plugin to use Dotty in your own build, see
   // https://github.com/lampepfl/dotty-example-project for usage.

tests/scala2-interop/sbt-test/3rdparty/finagle/build.sbt

@@ -0,0 +1,4 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies +=
+  ("com.twitter" %% "finagle-core" % "20.9.0").withDottyCompat(scalaVersion.value)

tests/scala2-interop/sbt-test/3rdparty/finagle/i9916.scala

@@ -0,0 +1,10 @@
+import com.twitter.finagle.Stack
+import com.twitter.finagle.liveness.FailureAccrualFactory
+
+trait T {
+  def p: FailureAccrualFactory.Param
+}
+
+class A {
+  val t = Stack.Param[FailureAccrualFactory.Param](FailureAccrualFactory.Param(???))
+}

tests/scala2-interop/sbt-test/3rdparty/finagle/pending

@@ -0,0 +1 @@
+> compile

tests/scala2-interop/sbt-test/3rdparty/finagle/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

tests/scala2-interop/sbt-test/pos/i9916a/build.sbt

@@ -0,0 +1,15 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val `i9916a-lib` = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val `i9916a-test` = (project in file ("main"))
+  .dependsOn(`i9916a-lib`)
+  .settings(
+    scalaVersion := scala3Version,
+    // https://github.com/sbt/sbt/issues/5369
+    projectDependencies := {
+      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+    }
+  )

tests/scala2-interop/sbt-test/pos/i9916a/lib/i9916a-lib.scala

@@ -0,0 +1,7 @@
+package i9916a
+
+object Lib {
+  trait P
+  object P
+  def P(x: Int): P = ???
+}

tests/scala2-interop/sbt-test/pos/i9916a/main/i9916a-test.scala

@@ -0,0 +1,5 @@
+import i9916a.Lib
+
+trait Test {
+  def foo: Lib.P
+}

tests/scala2-interop/sbt-test/pos/i9916a/pending

@@ -0,0 +1 @@
+> i9916a-test/compile

tests/scala2-interop/sbt-test/pos/i9916a/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

tests/scala2-interop/sbt-test/pos/i9916b/build.sbt

@@ -0,0 +1,15 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val `i9916b-lib` = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val `i9916b-test` = (project in file ("main"))
+  .dependsOn(`i9916b-lib`)
+  .settings(
+    scalaVersion := scala3Version,
+    // https://github.com/sbt/sbt/issues/5369
+    projectDependencies := {
+      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+    }
+  )

tests/scala2-interop/sbt-test/pos/i9916b/lib/i9916b-lib.scala

@@ -0,0 +1,7 @@
+package i9916b
+
+trait T {
+  class A
+  object A
+  def A(x: Int): Unit = ???
+}

tests/scala2-interop/sbt-test/pos/i9916b/main/i9916b-test.scala

@@ -0,0 +1,5 @@
+import i9916b.T
+
+trait Test {
+  def foo: T
+}

tests/scala2-interop/sbt-test/pos/i9916b/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

tests/scala2-interop/sbt-test/pos/i9916b/test

@@ -0,0 +1 @@
+> i9916b-test/compile