Merge pull request #6876 from dotty-staging/fix-#6872

Fix #6872: Move dotty-semanticdb to the community build

Author: nicolasstucki

.drone.yml

@@ -40,7 +40,7 @@ steps:
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/2/ && cd /tmp/2/
-  - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test; dotty-semanticdb/compile; dotty-semanticdb/test:compile;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test"
+  - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test"
   - ./project/scripts/bootstrapCmdTests
 
 - name: community_build

.gitmodules

@@ -47,3 +47,6 @@
 [submodule "community-build/community-projects/xml-interpolator"]
 	path = community-build/community-projects/xml-interpolator
 	url = https://github.com/lampepfl/xml-interpolator.git
+[submodule "community-build/community-projects/semanticdb"]
+	path = community-build/community-projects/semanticdb
+	url = https://github.com/lampepfl/dotty-semanticdb.git

build.sbt

@@ -13,8 +13,6 @@ val `dotty-sbt-bridge-tests` = Build.`dotty-sbt-bridge-tests`
 val `dotty-language-server` = Build.`dotty-language-server`
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
-val `dotty-semanticdb` = Build.`dotty-semanticdb`
-val `dotty-semanticdb-input` = Build.`dotty-semanticdb-input`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`

community-build/community-projects/semanticdb

@@ -183,6 +183,12 @@ class CommunityBuildTest {
     updateCommand = "update"
   )
 
+  @Test def semanticdb = test(
+    project       = "semanticdb",
+    testCommand   = "test:compile",
+    updateCommand = "update"
+  )
+
   // TODO @oderky? It got broken by #5458
   // @Test def pdbp = test(
   //   project       = "pdbp",

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -13,4 +13,5 @@ To add your project to the community build you can follow these steps:
 
 2. Open a PR against this repo that:
      - Adds your project as a new git submodule
+       - `git submodule add https://github.com/lampepfl/XYZ.git community-build/community-projects/XYZ`
      - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/master/src/test/scala/dotty/community-build/src/test/scala/dotty/communitybuild/CommunityBuildTest.scala)

community-build/test/scala/dotty/communitybuild/readme.md

@@ -335,18 +335,6 @@ object Build {
     dottyLib + File.pathSeparator + findLib(attList, "scala-library-")
   }
 
-  lazy val semanticdbSettings = Seq(
-    baseDirectory in (Compile, run) := baseDirectory.value / "..",
-    baseDirectory in Test := baseDirectory.value / "..",
-    unmanagedSourceDirectories in Test += baseDirectory.value / "input" / "src" / "main" / "scala",
-    scalacOptions in Test ++= Seq("-Yno-inline"),
-    libraryDependencies ++= List(
-      ("org.scalameta" %% "semanticdb" % "4.0.0").withDottyCompat(scalaVersion.value),
-      "com.novocode" % "junit-interface" % "0.11",
-      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0"
-    )
-  )
-
   def dottyDocSettings(implicit mode: Mode) = Seq(
     baseDirectory in (Compile, run) := baseDirectory.value / "..",
     baseDirectory in Test := baseDirectory.value / "..",
@@ -957,13 +945,6 @@ object Build {
   lazy val `dotty-bench` = project.in(file("bench")).asDottyBench(NonBootstrapped)
   lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)
 
-  lazy val `dotty-semanticdb` = project.in(file("semanticdb")).asDottySemanticdb(Bootstrapped)
-  lazy val `dotty-semanticdb-input` = project.in(file("semanticdb/input")).settings(
-    scalaVersion := "2.12.7",
-    scalacOptions += "-Yrangepos",
-    addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.0.0" cross CrossVersion.full)
-  )
-
   // Depend on dotty-library so that sbt projects using dotty automatically
   // depend on the dotty-library
   lazy val `scala-library` = project.
@@ -1246,11 +1227,6 @@ object Build {
       settings(commonBenchmarkSettings).
       enablePlugins(JmhPlugin)
 
-    def asDottySemanticdb(implicit mode: Mode): Project = project.withCommonSettings.
-      aggregate(`dotty-semanticdb-input`).
-      dependsOn(dottyCompiler).
-      settings(semanticdbSettings)
-
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.