Permalink
Browse files

Bump sbt to 0.11.3 and sbt-play-artifacts to 1.6

  • Loading branch information...
1 parent 4d0bd39 commit 45c08b78278542d02ba0f6fc7cb44a16fae02b5f @sihil sihil committed May 23, 2012
View
@@ -4,7 +4,7 @@ import Defaults._
import sbtassembly.Plugin._
import AssemblyKeys._
import PlayProject.{SCALA,dist}
-import com.gu.PlayArtifact._
+import com.gu.deploy.PlayArtifact._
object MagentaBuild extends Build {
lazy val root = Project("root", file(".")) aggregate (lib, cli, riffraff)
@@ -24,13 +24,7 @@ object MagentaBuild extends Build {
.settings( magentaSettings: _* )
.settings(
testOptions in Test := Nil,
- jarName in assembly := "%s.jar" format name,
- mergeStrategy in assembly <<= (mergeStrategy in assembly) { current =>
- {
- case "play.plugins" => MergeStrategy.concat
- case other => current(other)
- }
- }
+ jarName in assembly := "%s.jar" format name
)
View
@@ -1 +1 @@
-sbt.version=0.11.2
+sbt.version=0.11.3
View
@@ -1,13 +1,11 @@
resolvers ++= Seq(
- "Web plugin repo" at "http://siasia.github.com/maven2",
- "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
- "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"
+ Classpaths.typesafeResolver,
+ "sbt-idea-repo" at "http://mpeltonen.github.com/maven/",
+ Resolver.url("Play 2.1-SNAPSHOT", url("http://guardian.github.com/ivy/repo-snapshots"))(Resolver.ivyStylePatterns)
)
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.0")
-addSbtPlugin("play" % "sbt-plugin" % "2.0")
+addSbtPlugin("play" % "sbt-plugin" % "2.1-SNAPSHOT")
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
-
-libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11"))
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
@@ -1,7 +1,7 @@
import sbt._
object DeployPlugins extends Build {
- val playArtifactPluginVersion = "1.1"
+ val playArtifactPluginVersion = "1.6"
lazy val plugins = Project("deploy-plugins", file("."))
.dependsOn(
@@ -1,4 +1,4 @@
-@(request: controllers.AuthenticatedRequest[AnyContent], updateActorPath: String)
+@(implicit request: controllers.AuthenticatedRequest[AnyContent], updateActorPath: String)
@main("Deployment Tasks for frontend::article", request) {
View
@@ -6,3 +6,9 @@ libraryDependencies ++= Seq(
"com.gu" %% "management-play" % "5.10",
"com.gu" %% "management-logback" % "5.10"
)
+
+ivyXML :=
+ <dependencies>
+ <exclude org="commons-logging"><!-- Conflicts with jcl-over-slf4j in Play. --></exclude>
+ <exclude org="org.springframework"><!-- Because I don't like it. --></exclude>
+ </dependencies>
View
2 sbt
@@ -10,5 +10,5 @@ java -Xmx768M -XX:+UseCompressedOops -XX:MaxPermSize=384m \
-Dhttp.proxyHost=devscreen.gudev.gnl -Dhttp.proxyPort=3128 \
-Dsbt.boot.directory=$SBT_BOOT_DIR \
$SBT_EXTRA_PARAMS \
- -jar `dirname $0`/sbt-launch-0.11.2.jar "$@"
+ -jar `dirname $0`/sbt-launch-0.11.3.jar "$@"
Binary file not shown.
View
2 sbt-tc
@@ -14,5 +14,5 @@ cat /dev/null | java -Xmx1G -XX:MaxPermSize=250m -XX:+UseCompressedOops \
-Dsbt.boot.directory=$SBT_BOOT_DIR \
-Dhttp.proxyHost=devscreen.gudev.gnl\
-Dhttp.proxyPort=3128 \
- -jar sbt-launch-0.11.2.jar "$@"
+ -jar sbt-launch-0.11.3.jar "$@"

0 comments on commit 45c08b7

Please sign in to comment.