diff --git a/Gemfile b/Gemfile index ee0889a..8fb6b73 100644 --- a/Gemfile +++ b/Gemfile @@ -3,16 +3,7 @@ source 'https://rubygems.org' gemspec group :development do - gem 'rake', '~> 0.8.7' - - case RUBY_PLATFORM - when 'java' - gem 'maruku', '~> 0.6.0' - else - gem 'rdiscount', '~> 1.6.3' - end - - gem 'ore-core', '~> 0.1.0' - gem 'ore-tasks', '~> 0.3.0' - gem 'yard', '~> 0.6.0' + gem 'rake', '~> 0.8' + gem 'kramdown', '~> 0.13' + gem 'ore-tasks', '~> 0.4' end diff --git a/Gemfile.lock b/Gemfile.lock index 6184e59..1d45d78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,33 +2,35 @@ PATH remote: . specs: wsoc (0.1.3) - json_pure (~> 1.4.0) - sinatra (~> 1.0.0) + json (~> 1.4) + sinatra (~> 1.0) GEM remote: https://rubygems.org/ specs: - json_pure (1.4.6) - ore-core (0.1.0) - ore-tasks (0.3.0) - ore-core (~> 0.1.0) - rack (1.2.1) - rake (0.8.7) - rdiscount (1.6.5) - sinatra (1.0) - rack (>= 1.0) - yard (0.6.1) + json (1.6.3) + kramdown (0.13.3) + ore-core (0.1.5) + ore-tasks (0.5.0) + ore-core (>= 0.1.3, ~> 0.1) + rack (1.3.5) + rack-protection (1.1.4) + rack + rake (0.9.2.2) + sinatra (1.3.1) + rack (~> 1.3, >= 1.3.4) + rack-protection (~> 1.1, >= 1.1.2) + tilt (~> 1.3, >= 1.3.3) + tilt (1.3.3) + yard (0.7.4) PLATFORMS ruby DEPENDENCIES - bundler (~> 1.0.0) - json_pure (~> 1.4.0) - ore-core (~> 0.1.0) - ore-tasks (~> 0.3.0) - rake (~> 0.8.7) - rdiscount (~> 1.6.3) - sinatra (~> 1.0.0) + bundler (~> 1.0) + kramdown (~> 0.13) + ore-tasks (~> 0.4) + rake (~> 0.8) wsoc! - yard (~> 0.6.0) + yard (~> 0.7) diff --git a/gemspec.yml b/gemspec.yml index b742f93..2439f61 100644 --- a/gemspec.yml +++ b/gemspec.yml @@ -14,9 +14,9 @@ homepage: http://github.com/postmodern/wsoc has_yard: true dependencies: - json_pure: ~> 1.4.0 - sinatra: ~> 1.0.0 + json: ~> 1.4 + sinatra: ~> 1.0 development_dependencies: - bundler: ~> 1.0.0 - yard: ~> 0.6.0 + bundler: ~> 1.0 + yard: ~> 0.7