Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix HashMap usage and update to latest finagle/util

  • Loading branch information...
commit 511fd10d9dd9f799073e7392c1040c995c430d0f 1 parent 02ce6f4
marius a. eriksen mariusae authored
4 lib/template/project/build/BirdNameProject.scala.erb
View
@@ -17,7 +17,7 @@ class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
with PublishSourcesAndJavadocs
with PublishSite
{
- val finagleVersion = "1.2.5"
+ val finagleVersion = "1.8.4"
val finagleC = "com.twitter" % "finagle-core" % finagleVersion
val finagleT = "com.twitter" % "finagle-thrift" % finagleVersion
@@ -25,7 +25,7 @@ class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
// thrift
val libthrift = "thrift" % "libthrift" % "0.5.0"
- val util = "com.twitter" % "util" % "1.8.3"
+ val util = "com.twitter" % "util" % "1.11.2"
override def originalThriftNamespaces = Map("BirdName" -> "com.twitter.birdname.thrift")
override val scalaThriftTargetNamespace = "com.twitter.birdname"
3  lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb
View
@@ -24,7 +24,8 @@ class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameService
*
*/
- val database = new mutable.HashMap[String, String]()
+ val database = new mutable.HashMap[String, String]
+ with mutable.SynchronizedMap[String, String]
def get(key: String) = {
database.get(key) match {
70 scala-bootstrapper.gemspec
View
@@ -1,63 +1,67 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = %q{scala-bootstrapper}
- s.version = "0.9.1"
+ s.version = "0.9.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Kyle Maxwell"]
- s.date = %q{2011-04-15}
+ s.date = %q{2011-08-23}
s.default_executable = %q{scala-bootstrapper}
s.description = %q{Twitter scala project init}
s.email = %q{kmaxwell@twitter.com}
s.executables = ["scala-bootstrapper"]
s.extra_rdoc_files = [
"LICENSE",
- "README.rdoc"
+ "README.rdoc"
]
s.files = [
".document",
- "HACKING",
- "LICENSE",
- "README.rdoc",
- "Rakefile",
- "VERSION",
- "bin/scala-bootstrapper",
- "lib/template/.gitignore",
- "lib/template/Capfile",
- "lib/template/Gemfile",
- "lib/template/config/development.scala.erb",
- "lib/template/config/production.scala.erb",
- "lib/template/config/staging.scala.erb",
- "lib/template/config/test.scala.erb",
- "lib/template/project/build.properties",
- "lib/template/project/build/BirdNameProject.scala.erb",
- "lib/template/project/plugins/Plugins.scala.erb",
- "lib/template/run",
- "lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb",
- "lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb",
- "lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb",
- "lib/template/src/main/thrift/birdname.thrift.erb",
- "lib/template/src/scripts/console.erb",
- "lib/template/src/scripts/startup.sh",
- "lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb",
- "lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb",
- "scala-bootstrapper.gemspec",
- "vendor/trollop.rb"
+ ".gitignore",
+ "HACKING",
+ "LICENSE",
+ "README.rdoc",
+ "Rakefile",
+ "VERSION",
+ "bin/scala-bootstrapper",
+ "lib/template/.gitignore.erb",
+ "lib/template/Capfile",
+ "lib/template/Gemfile",
+ "lib/template/README.md",
+ "lib/template/TUTORIAL.md",
+ "lib/template/config/development.scala.erb",
+ "lib/template/config/production.scala.erb",
+ "lib/template/config/staging.scala.erb",
+ "lib/template/config/test.scala.erb",
+ "lib/template/project/build.properties",
+ "lib/template/project/build/BirdNameProject.scala.erb",
+ "lib/template/project/plugins/Plugins.scala.erb",
+ "lib/template/run",
+ "lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb",
+ "lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb",
+ "lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb",
+ "lib/template/src/main/thrift/birdname.thrift.erb",
+ "lib/template/src/scripts/console.erb",
+ "lib/template/src/scripts/startup.sh",
+ "lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb",
+ "lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb",
+ "scala-bootstrapper.gemspec",
+ "vendor/trollop.rb"
]
s.homepage = %q{http://github.com/fizx/scala-bootstrapper}
+ s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.6}
+ s.rubygems_version = %q{1.3.7}
s.summary = %q{Twitter scala project init}
if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
else
s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
Please sign in to comment.
Something went wrong with that request. Please try again.