From 4973156eac1f0139b51cf9f5eefdc6558903c6d5 Mon Sep 17 00:00:00 2001 From: Matt Russell Date: Mon, 17 Oct 2011 22:58:03 +0100 Subject: [PATCH] sbt 11 build --- CHANGELOG | 1 + project/Build.scala | 32 +++++++++++++++++++++----------- project/build.properties | 2 +- project/plugins/build.sbt | 2 +- scalariform/.classpath | 2 +- scalariform/META-INF/MANIFEST.MF | 1 + 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ade0b53d..92deb877 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/project/Build.scala b/project/Build.scala index 97d05b42..fb51a546 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1,15 +1,15 @@ 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", @@ -17,21 +17,31 @@ object MyBuild extends Build { 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") diff --git a/project/build.properties b/project/build.properties index f47a3009..f2ccdfa3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.10.1 +sbt.version=0.11.0 diff --git a/project/plugins/build.sbt b/project/plugins/build.sbt index 0f3e4614..185bdc21 100644 --- a/project/plugins/build.sbt +++ b/project/plugins/build.sbt @@ -1,3 +1,3 @@ resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/" -libraryDependencies += "com.typesafe" %% "sbt-scalariform" % "0.1" \ No newline at end of file +// libraryDependencies += "com.typesafe" %% "sbt-scalariform" % "0.1" diff --git a/scalariform/.classpath b/scalariform/.classpath index 8b865ea7..e273a272 100644 --- a/scalariform/.classpath +++ b/scalariform/.classpath @@ -5,6 +5,6 @@ - + diff --git a/scalariform/META-INF/MANIFEST.MF b/scalariform/META-INF/MANIFEST.MF index d6ab2219..70a36d1b 100644 --- a/scalariform/META-INF/MANIFEST.MF +++ b/scalariform/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Export-Package: scalariform.astselect, scalariform.lexer, scalariform.parser, scalariform.utils +Bundle-RequiredExecutionEnvironment: J2SE-1.5