Permalink
Browse files

sbt 11 build

  • Loading branch information...
1 parent 6f651a2 commit 4973156eac1f0139b51cf9f5eefdc6558903c6d5 @mdr mdr committed Oct 17, 2011
Showing with 26 additions and 14 deletions.
  1. +1 −0 CHANGELOG
  2. +21 −11 project/Build.scala
  3. +1 −1 project/build.properties
  4. +1 −1 project/plugins/build.sbt
  5. +1 −1 scalariform/.classpath
  6. +1 −0 scalariform/META-INF/MANIFEST.MF
View
@@ -11,6 +11,7 @@
* Fix parser crash on argument-less constructor annotations
* Add PlaceScaladocAsterisksBeneathSecondAsterisk preference to conform to recommended Scaladoc style (issue #30)
* FIX: Removal of space causing token merge in varargs and unary ops (http://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1000601)
+* Switch to sbt 0.11 build
0.1.0 (16/July/11)
View
@@ -1,37 +1,47 @@
import sbt._
import sbt.Keys._
-import ScalariformPlugin.{ format, formatPreferences }
-import scalariform.formatter.preferences._
+//import ScalariformPlugin.{ format, formatPreferences }
+//import scalariform.formatter.preferences._
-object MyBuild extends Build {
+object ScalariformBuild extends Build {
lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "scalariform",
version := "0.1.1-SNAPSHOT",
scalaVersion := "2.9.0",
- crossScalaVersions := Seq("2.8.0", "2.8.1", "2.8.2-SNAPSHOT", "2.9.0", "2.9.0-1", "2.9.1-SNAPSHOT"),
+ crossScalaVersions := Seq("2.8.0", "2.8.1", "2.8.2", "2.8.3-SNAPSHOT", "2.9.0", "2.9.0-1", "2.9.1", "2.10.0-SNAPSHOT"),
resolvers += ScalaToolsSnapshots,
retrieveManaged := true,
scalacOptions += "-deprecation",
logLevel in test := Level.Warn,
pomExtra := pomExtraXml,
publishMavenStyle := true,
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
- ) ++ formatterSettings
+ ) // ++ formatterSettings
- lazy val formatterSettings = ScalariformPlugin.settings ++ Seq(
- formatPreferences in Compile := formattingPreferences,
- formatPreferences in Test := formattingPreferences
- )
+ //lazy val formatterSettings = ScalariformPlugin.settings ++ Seq(
+ // formatPreferences in Compile := formattingPreferences,
+ // formatPreferences in Test := formattingPreferences
+ // )
- def formattingPreferences = PreferencesImporterExporter.loadPreferences("formatterPreferences.properties").asInstanceOf[FormattingPreferences]
+ // def formattingPreferences = PreferencesImporterExporter.loadPreferences("formatterPreferences.properties").asInstanceOf[FormattingPreferences]
lazy val root = Project("root", file("."), settings = buildSettings) aggregate(
scalariform, gui, perf, corpusScan)
lazy val scalariform: Project = Project("scalariform", file("scalariform"), settings = buildSettings ++
Seq(
- libraryDependencies += "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test",
+ libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
+ val scalatestVersion = sv match {
+ case "2.8.0" => "org.scalatest" %% "scalatest" % "1.3.1.RC2" % "test"
+ case "2.8.1" => "org.scalatest" %% "scalatest" % "1.5.1" % "test"
+ case "2.8.2" => "org.scalatest" %% "scalatest" % "1.5.1" % "test"
+ case "2.8.3-SNAPSHOT" => "org.scalatest" % "scalatest_2.8.2" % "1.5.1" % "test"
+ case "2.10.0-SNAPSHOT" => "org.scalatest" % "scalatest_2.9.1" % "1.6.1" % "test"
+ case _ => "org.scalatest" %% "scalatest" % "1.6.1" % "test"
+ }
+ deps :+ scalatestVersion
+ },
mainClass in (Compile, packageBin) := Some("scalariform.commandline.Main"),
publishTo <<= version { (v: String) =>
if (v endsWith "-SNAPSHOT")
View
@@ -1 +1 @@
-sbt.version=0.10.1
+sbt.version=0.11.0
@@ -1,3 +1,3 @@
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
-libraryDependencies += "com.typesafe" %% "sbt-scalariform" % "0.1"
+// libraryDependencies += "com.typesafe" %% "sbt-scalariform" % "0.1"
View
@@ -5,6 +5,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="lib_managed/scala_2.9.0/test/scalatest_2.9.0-1.4.1.jar"/>
+ <classpathentry kind="lib" path="lib_managed/scala_2.10.0-SNAPSHOT/scalatest_2.9.1-1.6.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -11,3 +11,4 @@ Export-Package: scalariform.astselect,
scalariform.lexer,
scalariform.parser,
scalariform.utils
+Bundle-RequiredExecutionEnvironment: J2SE-1.5

0 comments on commit 4973156

Please sign in to comment.