Merge branch 'cage'

lenn0x · Feb 13, 2012 · 94916cf · 94916cf
2 parents 90bcf76 + 681d6a7
commit 94916cf
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
@@ -1,19 +1,24 @@
- import sbt._
+import sbt._
 
-class Plugins(info: sbt.ProjectInfo) extends sbt.PluginDefinition(info) {
-   import scala.collection.jcl
-   val environment = jcl.Map(System.getenv())
-   def isSBTOpenTwitter = environment.get("SBT_OPEN_TWITTER").isDefined
-   def isSBTTwitter = environment.get("SBT_TWITTER").isDefined
+class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
+  import scala.collection.jcl
+  val environment = jcl.Map(System.getenv())
+  def isSBTOpenTwitter = environment.get("SBT_OPEN_TWITTER").isDefined
+  def isSBTTwitter = environment.get("SBT_TWITTER").isDefined
+  def isInternal = isSBTOpenTwitter || isSBTTwitter
 
-   override def repositories = if (isSBTOpenTwitter) {
-     Set("twitter.artifactory" at "http://artifactory.local.twitter.com/open-source/")
-   } else if (isSBTTwitter) {
-     Set("twitter.artifactory" at "http://artifactory.local.twitter.com/repo/")
-   } else {
-     super.repositories ++ Seq("twitter.com" at "http://maven.twttr.com/")
-   }
-   override def ivyRepositories = Seq(Resolver.defaultLocal(None)) ++ repositories
+  override def repositories = if (isSBTOpenTwitter) {
+    Set("twitter.artifactory" at "http://artifactory.local.twitter.com/open-source/")
+  } else if (isSBTTwitter) {
+    Set("twitter.artifactory" at "http://artifactory.local.twitter.com/repo/")
+  } else {
+    super.repositories ++ Seq("twitter.com" at "http://maven.twttr.com/")
+  }
+  override def ivyRepositories =
+    if (isInternal)
+      Seq(Resolver.defaultLocal(None)) ++ repositories
+    else
+      super.ivyRepositories
 
   val defaultProject = "com.twitter" % "standard-project" % "0.12.12"
   val sbtThrift = "com.twitter" % "sbt-thrift" % "1.4.4"