@@ -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
@@ -65,26 +65,25 @@ object DottyBuild extends Build {
65
65
" dottydoc dependencies, should be moved to a dottydoc sbt subproject eventually"
66
66
)
67
67
68
- override def settings : Seq [Setting [_]] = {
69
- super .settings ++ Seq (
70
- scalaVersion in Global := scalacVersion,
71
- version in Global := dottyVersion,
72
- organization in Global := dottyOrganization,
73
- organizationName in Global := " LAMP/EPFL" ,
74
- organizationHomepage in Global := Some (url(" http://lamp.epfl.ch" )),
75
- homepage in Global := Some (url(" https://github.com/lampepfl/dotty" )),
76
-
77
- // scalac options
78
- scalacOptions in Global ++= Seq (
79
- " -feature" ,
80
- " -deprecation" ,
81
- " -encoding" , " UTF8" ,
82
- " -language:existentials,higherKinds,implicitConversions"
83
- ),
84
-
85
- javacOptions in Global ++= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
86
- )
87
- }
68
+ // Used in build.sbt
69
+ val thisBuildSettings = Seq (
70
+ scalaVersion in Global := scalacVersion,
71
+ version in Global := dottyVersion,
72
+ organization in Global := dottyOrganization,
73
+ organizationName in Global := " LAMP/EPFL" ,
74
+ organizationHomepage in Global := Some (url(" http://lamp.epfl.ch" )),
75
+ homepage in Global := Some (url(" https://github.com/lampepfl/dotty" )),
76
+
77
+ // scalac options
78
+ scalacOptions in Global ++= Seq (
79
+ " -feature" ,
80
+ " -deprecation" ,
81
+ " -encoding" , " UTF8" ,
82
+ " -language:existentials,higherKinds,implicitConversions"
83
+ ),
84
+
85
+ javacOptions in Global ++= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
86
+ )
88
87
89
88
/** Enforce 2.11.5. Do not let it be upgraded by dependencies. */
90
89
private val overrideScalaVersionSetting =
0 commit comments