aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2017-01-06 18:54:37 +0100
committerGuillaume Martres <smarter@ubuntu.com>2017-01-06 18:54:38 +0100
commit49ab23c8c4b74d32208fc062f94e5dcb1c7c33e7 (patch)
tree694c5d4582fc4f7b30f558155657ea56539a4a2b /project
parent42eb864dc752254fc3b8b0428570fe94aa1dafc7 (diff)
downloaddotty-49ab23c8c4b74d32208fc062f94e5dcb1c7c33e7.tar.gz
dotty-49ab23c8c4b74d32208fc062f94e5dcb1c7c33e7.tar.bz2
dotty-49ab23c8c4b74d32208fc062f94e5dcb1c7c33e7.zip
Fix dummy scala-library
To be useful, the dummy scala-library: - needs to be published with crossPaths off (the "_2.11" path of the artefact name), like the real scala-library - should depend on dotty-library and not just scala-library, since this is what is needed to compile dotty programs
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala14
1 files changed, 9 insertions, 5 deletions
diff --git a/project/Build.scala b/project/Build.scala
index ea7ce31af..5fa3eb4d4 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -555,11 +555,15 @@ object DottyInjectedPlugin extends AutoPlugin {
}
)
- lazy val `scala-library` = project
- .settings(
- libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
- )
- .settings(publishing)
+
+ // Dummy scala-library artefact. This is useful because sbt projects
+ // automatically depend on scalaOrganization.value % "scala-library" % scalaVersion.value
+ lazy val `scala-library` = project.
+ dependsOn(`dotty-library`).
+ settings(
+ crossPaths := false
+ ).
+ settings(publishing)
lazy val publishing = Seq(
publishMavenStyle := true,