aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.sbt14
-rw-r--r--project/Build.scala7
2 files changed, 7 insertions, 14 deletions
diff --git a/build.sbt b/build.sbt
deleted file mode 100644
index 24f2c12d7..000000000
--- a/build.sbt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-name := "dotty"
-
-scalaVersion in Global := "2.11.5"
-
-version in Global := "0.1-SNAPSHOT"
-
-organization in Global := "org.scala-lang"
-
-organizationName in Global := "LAMP/EPFL"
-
-organizationHomepage in Global := Some(url("http://lamp.epfl.ch"))
-
-homepage in Global := Some(url("http://scala-lang.org"))
diff --git a/project/Build.scala b/project/Build.scala
index b395f6f09..3a8ef0954 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -19,6 +19,13 @@ object DottyBuild extends Build {
var partestLock: FileLock = null
val defaults = Defaults.defaultSettings ++ Seq(
+ scalaVersion in Global := "2.11.5",
+ version in Global := "0.1-SNAPSHOT",
+ organization in Global := "org.scala-lang",
+ organizationName in Global := "LAMP/EPFL",
+ organizationHomepage in Global := Some(url("http://lamp.epfl.ch")),
+ homepage in Global := Some(url("https://github.com/lampepfl/dotty")),
+
// set sources to src/, tests to test/ and resources to resources/
scalaSource in Compile := baseDirectory.value / "src",
javaSource in Compile := baseDirectory.value / "src",