diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 58 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 8 |
3 files changed, 34 insertions, 34 deletions
diff --git a/project/Build.scala b/project/Build.scala index 05ae52cc9..ce560d8e4 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -10,7 +10,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt.Package.ManifestAttributes -object DottyBuild extends Build { +object Build { projectChecks() @@ -61,26 +61,25 @@ object DottyBuild extends Build { // Shorthand for compiling a docs site lazy val dottydoc = inputKey[Unit]("run dottydoc") - override def settings: Seq[Setting[_]] = { - super.settings ++ Seq( - scalaVersion in Global := scalacVersion, - version in Global := dottyVersion, - organization in Global := dottyOrganization, - organizationName in Global := "LAMP/EPFL", - organizationHomepage in Global := Some(url("http://lamp.epfl.ch")), - homepage in Global := Some(url("https://github.com/lampepfl/dotty")), - - // scalac options - scalacOptions in Global ++= Seq( - "-feature", - "-deprecation", - "-encoding", "UTF8", - "-language:existentials,higherKinds,implicitConversions" - ), - - javacOptions in Global ++= Seq("-Xlint:unchecked", "-Xlint:deprecation") - ) - } + // Used in build.sbt + val thisBuildSettings = Seq( + scalaVersion in Global := scalacVersion, + version in Global := dottyVersion, + organization in Global := dottyOrganization, + organizationName in Global := "LAMP/EPFL", + organizationHomepage in Global := Some(url("http://lamp.epfl.ch")), + homepage in Global := Some(url("https://github.com/lampepfl/dotty")), + + // scalac options + scalacOptions in Global ++= Seq( + "-feature", + "-deprecation", + "-encoding", "UTF8", + "-language:existentials,higherKinds,implicitConversions" + ), + + javacOptions in Global ++= Seq("-Xlint:unchecked", "-Xlint:deprecation") + ) /** Enforce 2.11.5. Do not let it be upgraded by dependencies. */ private val overrideScalaVersionSetting = @@ -126,7 +125,7 @@ object DottyBuild extends Build { lazy val dotty = project.in(file(".")). // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-doc`, dottySbtBridgeRef, - `scala-library`, `scala-compiler`, `scala-reflect`, `scalap`). + `scala-library`, `scala-compiler`, `scala-reflect`, scalap). dependsOn(`dotty-compiler`). dependsOn(`dotty-library`). settings( @@ -283,8 +282,11 @@ object DottyBuild extends Build { libraryDependencies ++= partestDeps.value, libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "1.0.1", "org.scala-lang.modules" %% "scala-partest" % "1.0.11" % "test", - "com.novocode" % "junit-interface" % "0.11" % "test", - "com.typesafe.sbt" % "sbt-interface" % sbtVersion.value), + "com.novocode" % "junit-interface" % "0.11" % "test"), + + resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:interface + libraryDependencies += "org.scala-sbt" % "interface" % sbtVersion.value, + // enable improved incremental compilation algorithm incOptions := incOptions.value.withNameHashing(true), @@ -430,7 +432,7 @@ object DottyBuild extends Build { // FIXME: should go away when xml literal parsing is removed path.contains("scala-xml") || // needed for the xsbti interface - path.contains("sbt-interface") + path.contains("org.scala-sbt/interface/") } yield "-Xbootclasspath/p:" + path val ci_build = // propagate if this is a ci build @@ -554,9 +556,9 @@ object DottyBuild extends Build { }, publishLocal := (publishLocal.dependsOn(cleanSbtBridge)).value, description := "sbt compiler bridge for Dotty", - resolvers += Resolver.typesafeIvyRepo("releases"), + resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt stuff libraryDependencies ++= Seq( - "com.typesafe.sbt" % "sbt-interface" % sbtVersion.value, + "org.scala-sbt" % "interface" % sbtVersion.value, "org.scala-sbt" % "api" % sbtVersion.value % "test", "org.specs2" %% "specs2" % "2.3.11" % "test" ), @@ -727,7 +729,7 @@ object DottyInjectedPlugin extends AutoPlugin { libraryDependencies := Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value) ). settings(publishing) - lazy val `scalap` = project. + lazy val scalap = project. settings( crossPaths := false, libraryDependencies := Seq("org.scala-lang" % "scalap" % scalaVersion.value) diff --git a/project/build.properties b/project/build.properties index 43b8278c6..866eb2660 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.11 +sbt.version=0.13.14-RC2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 71a7ef5b6..81d5ceb91 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,10 +3,8 @@ // e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0") // Scala IDE project file generator -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.1.0") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") - -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4") |