Skip to content

Commit

Permalink
Fix scala#6872: Move dotty-semanticdb to the community build
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasstucki committed Jul 17, 2019
1 parent ae4ee41 commit bd2f8a6
Show file tree
Hide file tree
Showing 58 changed files with 12 additions and 2,858 deletions.
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
1 change: 1 addition & 0 deletions community-build/community-projects/semanticdb
Submodule semanticdb added at f34172
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions community-build/test/scala/dotty/communitybuild/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
24 changes: 0 additions & 24 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 / "..",
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 0 additions & 3 deletions semanticdb/input/build.sbt

This file was deleted.

1 change: 0 additions & 1 deletion semanticdb/input/project/build.properties

This file was deleted.

27 changes: 0 additions & 27 deletions semanticdb/input/src/main/scala/example/Access.scala

This file was deleted.

38 changes: 0 additions & 38 deletions semanticdb/input/src/main/scala/example/Advanced.scala

This file was deleted.

18 changes: 0 additions & 18 deletions semanticdb/input/src/main/scala/example/Anonymous.scala

This file was deleted.

9 changes: 0 additions & 9 deletions semanticdb/input/src/main/scala/example/Apply.scala

This file was deleted.

7 changes: 0 additions & 7 deletions semanticdb/input/src/main/scala/example/BinaryOp.scala

This file was deleted.

12 changes: 0 additions & 12 deletions semanticdb/input/src/main/scala/example/Case.scala

This file was deleted.

56 changes: 0 additions & 56 deletions semanticdb/input/src/main/scala/example/Classes.scala

This file was deleted.

9 changes: 0 additions & 9 deletions semanticdb/input/src/main/scala/example/DependantModule.scala

This file was deleted.

9 changes: 0 additions & 9 deletions semanticdb/input/src/main/scala/example/DottyPredef.scala

This file was deleted.

9 changes: 0 additions & 9 deletions semanticdb/input/src/main/scala/example/Empty.scala

This file was deleted.

3 changes: 0 additions & 3 deletions semanticdb/input/src/main/scala/example/EmptyObject.scala

This file was deleted.

22 changes: 0 additions & 22 deletions semanticdb/input/src/main/scala/example/Example.scala

This file was deleted.

10 changes: 0 additions & 10 deletions semanticdb/input/src/main/scala/example/Example2.scala

This file was deleted.

4 changes: 0 additions & 4 deletions semanticdb/input/src/main/scala/example/Exclude.scala

This file was deleted.

23 changes: 0 additions & 23 deletions semanticdb/input/src/main/scala/example/Flags.scala

This file was deleted.

8 changes: 0 additions & 8 deletions semanticdb/input/src/main/scala/example/IgnoredSymbol.scala

This file was deleted.

11 changes: 0 additions & 11 deletions semanticdb/input/src/main/scala/example/Issue1749.scala

This file was deleted.

Loading

0 comments on commit bd2f8a6

Please sign in to comment.