Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'fix_plugins'

  • Loading branch information...
commit cc2a80743d7cb67681edc14d20c4a742210a769a 2 parents 5881a7f + 265fb54
Robey Pointer authored
View
5 lib/template/Gemfile
@@ -1,7 +1,8 @@
+# use "bundle install" to update gems; "gem install bundler" to install bundler.
source :rubygems
source "http://gems.local.twitter.com"
-gem "thrift_client", "0.6"
-gem "thrift", "0.5"
+gem "thrift_client", "0.6.2"
+gem "thrift", "0.6"
gem "railsless-deploy"
gem "capistrano"
gem "twitter-cap-utils", "~>0.8.0"
View
8 lib/template/project/plugins/Plugins.scala.erb
@@ -13,8 +13,10 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
} else {
super.repositories ++ Seq("twitter.com" at "http://maven.twttr.com/")
}
- override def ivyRepositories = Seq(Resolver.defaultLocal(None)) ++ repositories
+ override def ivyRepositories = Seq(Resolver.defaultLocal(None)) ++ repositories ++
+ Set("scala-tools" at "http://scala-tools.org/repo-releases/",
+ "freemarker" at "http://freemarker.sourceforge.net/maven2/")
- val standardProject = "com.twitter" % "standard-project" % "0.11.16"
- val sbtThrift = "com.twitter" % "sbt-thrift" % "1.3.11"
+ val standardProject = "com.twitter" % "standard-project" % "0.12.3"
+ val sbtThrift = "com.twitter" % "sbt-thrift" % "1.4.4"
}
Please sign in to comment.
Something went wrong with that request. Please try again.