@@ -10,7 +10,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin
10
10
import org .scalajs .sbtplugin .ScalaJSPlugin .autoImport ._
11
11
import sbt .Package .ManifestAttributes
12
12
13
- object DottyBuild extends Build {
13
+ object Build {
14
14
15
15
val scalacVersion = " 2.11.5" // Do not rename, this is grepped in bin/common.
16
16
@@ -59,26 +59,25 @@ object DottyBuild extends Build {
59
59
// Shorthand for compiling a docs site
60
60
lazy val dottydoc = inputKey[Unit ](" run dottydoc" )
61
61
62
- override def settings : Seq [Setting [_]] = {
63
- super .settings ++ Seq (
64
- scalaVersion in Global := scalacVersion,
65
- version in Global := dottyVersion,
66
- organization in Global := dottyOrganization,
67
- organizationName in Global := " LAMP/EPFL" ,
68
- organizationHomepage in Global := Some (url(" http://lamp.epfl.ch" )),
69
- homepage in Global := Some (url(" https://github.com/lampepfl/dotty" )),
70
-
71
- // scalac options
72
- scalacOptions in Global ++= Seq (
73
- " -feature" ,
74
- " -deprecation" ,
75
- " -encoding" , " UTF8" ,
76
- " -language:existentials,higherKinds,implicitConversions"
77
- ),
78
-
79
- javacOptions in Global ++= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
80
- )
81
- }
62
+ // Used in build.sbt
63
+ val thisBuildSettings = Seq (
64
+ scalaVersion in Global := scalacVersion,
65
+ version in Global := dottyVersion,
66
+ organization in Global := dottyOrganization,
67
+ organizationName in Global := " LAMP/EPFL" ,
68
+ organizationHomepage in Global := Some (url(" http://lamp.epfl.ch" )),
69
+ homepage in Global := Some (url(" https://github.com/lampepfl/dotty" )),
70
+
71
+ // scalac options
72
+ scalacOptions in Global ++= Seq (
73
+ " -feature" ,
74
+ " -deprecation" ,
75
+ " -encoding" , " UTF8" ,
76
+ " -language:existentials,higherKinds,implicitConversions"
77
+ ),
78
+
79
+ javacOptions in Global ++= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
80
+ )
82
81
83
82
/** Enforce 2.11.5. Do not let it be upgraded by dependencies. */
84
83
private val overrideScalaVersionSetting =
@@ -124,7 +123,7 @@ object DottyBuild extends Build {
124
123
lazy val dotty = project.in(file(" ." )).
125
124
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
126
125
aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-doc`, dottySbtBridgeRef,
127
- `scala-library`, `scala-compiler`, `scala-reflect`, ` scalap` ).
126
+ `scala-library`, `scala-compiler`, `scala-reflect`, scalap).
128
127
dependsOn(`dotty-compiler`).
129
128
dependsOn(`dotty-library`).
130
129
settings(
@@ -728,7 +727,7 @@ object DottyInjectedPlugin extends AutoPlugin {
728
727
libraryDependencies := Seq (" org.scala-lang" % " scala-reflect" % scalaVersion.value)
729
728
).
730
729
settings(publishing)
731
- lazy val ` scalap` = project.
730
+ lazy val scalap = project.
732
731
settings(
733
732
crossPaths := false ,
734
733
libraryDependencies := Seq (" org.scala-lang" % " scalap" % scalaVersion.value)
0 commit comments