Permalink
Browse files

Changes to release 2.0.0 against sbt 0.12.0

  • Loading branch information...
1 parent 960bc91 commit 6bc029f74366be4e5f3c95fd81dbab452595c273 Heiko Seeberger committed Jul 16, 2012
View
@@ -16,13 +16,8 @@
* limitations under the License.
*/
-import com.typesafe.sbtscalariform.ScalariformPlugin._
-import name.heikoseeberger.sbtproperties.PropertiesPlugin._
-import posterous.Publish._
-import sbtrelease._
import sbt._
import sbt.Keys._
-import sbt.ScriptedPlugin._
object Build extends Build {
@@ -31,8 +26,7 @@ object Build extends Build {
file("."),
aggregate = Seq(sbteclipseCore, sbteclipsePlugin),
settings = commonSettings ++ Seq(
- publishArtifact := false,
- aggregate in Posterous := false
+ publishArtifact := false
)
)
@@ -63,31 +57,5 @@ object Build extends Build {
Some(if (version endsWith "SNAPSHOT") Classpaths.typesafeSnapshots else Classpaths.typesafeResolver)
),
publishMavenStyle := false
- ) ++
- posterousSettings ++ Seq(
- (email in Posterous) <<= PropertiesKeys.properties(_ get "posterous.email"),
- (password in Posterous) <<= PropertiesKeys.properties(_ get "posterous.password")
- ) ++
- propertiesSettings ++
- Release.releaseSettings ++ Seq(
- ReleaseKeys.releaseProcess <<= thisProjectRef { ref =>
- import ReleaseStateTransformations._
- Seq[ReleasePart](
- initialGitChecks,
- checkSnapshotDependencies,
- releaseTask(check in Posterous in ref),
- inquireVersions,
- runTest,
- setReleaseVersion,
- commitReleaseVersion,
- tagRelease,
- releaseTask(publish in Global in ref),
- releaseTask(publish in Posterous in ref),
- setNextVersion,
- commitNextVersion
- )
- }
- ) ++
- scalariformSettings ++
- scriptedSettings
+ )
}
View
@@ -1,17 +0,0 @@
-
-resolvers ++= Seq(
- "gseitz@github" at "http://gseitz.github.com/maven/",
- Resolver.url("heikoseeberger", new URL("http://hseeberger.github.com/releases"))(Resolver.ivyStylePatterns)
-)
-
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.4")
-
-addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.1")
-
-addSbtPlugin("name.heikoseeberger.sbtproperties" % "sbtproperties" % "1.0.1")
-
-addSbtPlugin("net.databinder" % "posterous-sbt" % "0.3.2")
-
-libraryDependencies <+= (sbtVersion)(sbtVersion =>
- "org.scala-tools.sbt" %% "scripted-plugin" % sbtVersion
-)
@@ -68,7 +68,7 @@ package object core {
}
def evaluateTask[A](key: TaskKey[A], ref: ProjectRef)(implicit state: State): ValidationNELS[A] =
- EvaluateTask(structure, key, state, ref, EvaluateConfig(false)) match {
+ EvaluateTask(structure, key, state, ref, EvaluateTask defaultConfig state) match {
case Some((_, Value(a))) => a.success
case Some((_, Inc(inc))) => "Error evaluating task '%s': %s".format(key.key, Incomplete.show(inc.tpe)).failNel
case None => "Undefined task '%s' for '%s'!".format(key.key, ref.project).failNel

0 comments on commit 6bc029f

Please sign in to comment.