Permalink
Browse files

Publish sbt-plugin to ivy repo. Everything else to maven repo.

  • Loading branch information...
1 parent 416cf66 commit ebef32fc640b16ac96c336a5259b9edab72f0365 @guillaumebort guillaumebort committed Feb 28, 2012
Showing with 12 additions and 4 deletions.
  1. +11 −3 framework/project/Build.scala
  2. +1 −1 framework/src/play/src/main/scala/play/api/Logger.scala
@@ -74,10 +74,11 @@ object PlayBuild extends Build {
file("src/sbt-plugin"),
settings = buildSettings ++ Seq(
sbtPlugin := true,
+ publishMavenStyle := false,
libraryDependencies := sbtDependencies,
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-core" % "2.0.0"),
unmanagedJars in Compile ++= sbtJars,
- publishTo := Some(playRepository),
+ publishTo := Some(playIvyRepository),
scalacOptions ++= Seq("-Xlint", "-deprecation", "-unchecked","-encoding", "utf8"),
javacOptions ++= Seq("-encoding", "utf8"),
publishArtifact in (Compile, packageDoc) := false,
@@ -155,11 +156,18 @@ object PlayBuild extends Build {
object Resolvers {
import BuildSettings._
+
val playLocalRepository = Resolver.file("Play Local Repository", file("../repository/local"))(Resolver.ivyStylePatterns)
+
val typesafe = "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
- val typesafeReleases = "Typesafe Releases Repository" at "http://repo.typesafe.com/typesafe/ivy-releases/"
- val typesafeSnapshot = "Typesafe Snapshots Repository" at "http://repo.typesafe.com/typesafe/ivy-snapshots/"
+
+ val typesafeReleases = "Typesafe Releases Repository" at "http://repo.typesafe.com/typesafe/maven-releases/"
+ val typesafeSnapshot = "Typesafe Snapshots Repository" at "http://repo.typesafe.com/typesafe/maven-snapshots/"
val playRepository = if (buildVersion.endsWith("SNAPSHOT")) typesafeSnapshot else typesafeReleases
+
+ val typesafeIvyReleases = Resolver.url("Typesafe Ivy Releases Repository", url("http://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns)
+ val typesafeIvySnapshot = Resolver.url("Typesafe Ivy Snapshots Repository", url("http://repo.typesafe.com/typesafe/ivy-snapshots/"))(Resolver.ivyStylePatterns)
+ val playIvyRepository = if (buildVersion.endsWith("SNAPSHOT")) typesafeIvySnapshot else typesafeIvyReleases
}
object Dependencies {
@@ -40,7 +40,7 @@ trait LoggerLike {
/**
* `true` if the logger instance is enabled for the `ERROR` level.
*/
- lazy val isErrorEnabled = logger.isWarnEnabled
+ lazy val isErrorEnabled = logger.isErrorEnabled
/**
* Logs a message with the `TRACE` level.

0 comments on commit ebef32f

Please sign in to comment.