Permalink
Browse files

Merge branch 'release-v0.2.20'

Conflicts:
	Gemfile.devtools
	mutant.gemspec
  • Loading branch information...
2 parents 6c31762 + 40240b0 commit 363ae0c54eea7554421f9c21185634e9d2f119c8 Markus Schirp committed Mar 1, 2013
Showing with 28 additions and 11 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 .travis.yml
  3. +10 −0 Changelog.md
  4. +2 −1 Gemfile
  5. +7 −3 Gemfile.devtools
  6. +5 −7 mutant.gemspec
View
@@ -3,3 +3,5 @@
/tmp
/coverage
/test_app/.rbx
+/.bundle
+/vendor
View
@@ -4,6 +4,7 @@ rvm:
- 1.8.7
- 1.9.2
- 1.9.3
+ - 2.0.0
- ruby-head
- rbx-19mode
matrix:
@@ -13,6 +14,7 @@ matrix:
- rvm: 1.8.7
# We'll see what happens
- rvm: ruby-head
+ - rvm: 2.0.0
notifications:
email:
- mbj@seonic.net
View
@@ -1,3 +1,9 @@
+# v0.2.20 2013-03-1
+
+* [change] Update dependencies
+
+[Compare v0.2.17..v0.2.20](https://github.com/mbj/mutant/compare/v0.2.17...v0.2.20)
+
# v0.2.17 2013-01-20
* [change][dm2] Kill mutations in #initialize from class methods.
@@ -6,10 +12,14 @@
* [change] Update dependencies
+[Compare v0.2.16..v0.2.17](https://github.com/mbj/mutant/compare/v0.2.16...v0.2.17)
+
# v0.2.16 2013-01-20
* [fixed] Handle Rubinius::AST::NthRef as noop
+[Compare v0.2.15..v0.2.16](https://github.com/mbj/mutant/compare/v0.2.15...v0.2.16)
+
# v0.2.15 2013-01-10
* [change] Do not mutate super to super() anymore. This needs a context check in future.
View
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
gemspec
gem 'composition', :git => 'https://github.com/mbj/composition.git'
+gem 'anima', :git => 'https://github.com/mbj/anima.git'
-gem 'devtools', :path => '../devtools' #:git => 'https://github.com/datamapper/devtools.git'
+gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
eval(File.read(File.join(File.dirname(__FILE__),'Gemfile.devtools')))
View
@@ -3,11 +3,11 @@
group :development do
gem 'rake', '~> 10.0.3'
gem 'rspec', '~> 2.13.0'
- gem 'yard', '~> 0.8.4.1'
+ gem 'yard', '~> 0.8.5'
end
group :yard do
- gem 'redcarpet', '~> 2.2.2', :platforms => [ :mri, :rbx ]
+ gem 'kramdown', '~> 0.14.2'
end
group :guard do
@@ -33,13 +33,17 @@ group :metrics do
gem 'flog', '~> 3.2.2'
gem 'reek', '~> 1.3.1'
gem 'metric_fu-roodi', '~> 2.2.1'
- gem 'yardstick', '~> 0.9.2'
+ gem 'yardstick', '~> 0.9.3'
platforms :ruby_18, :ruby_19 do
# this indirectly depends on ffi which does not build on ruby-head
gem 'yard-spellcheck', '~> 0.1.5'
end
+ platforms :mri_19, :rbx do
+ gem 'mutant', '~> 0.2.20'
+ end
+
platforms :mri_19 do
gem 'simplecov', '~> 0.7.1'
end
View
@@ -15,15 +15,13 @@ Gem::Specification.new do |gem|
gem.extra_rdoc_files = %w[TODO LICENSE]
gem.executables = [ 'mutant' ]
- gem.add_runtime_dependency('backports', '~> 2.8.2')
- gem.add_runtime_dependency('to_source', '~> 0.2.14')
+ gem.add_runtime_dependency('backports', [ '~> 3.0', '>= 3.0.3' ])
+ gem.add_runtime_dependency('to_source', '~> 0.2.19')
gem.add_runtime_dependency('ice_nine', '~> 0.7.0')
gem.add_runtime_dependency('descendants_tracker', '~> 0.0.1')
- gem.add_runtime_dependency('adamantium', '~> 0.0.6')
- gem.add_runtime_dependency('equalizer', '~> 0.0.4')
+ gem.add_runtime_dependency('adamantium', '~> 0.0.7')
+ gem.add_runtime_dependency('equalizer', '~> 0.0.5')
gem.add_runtime_dependency('inflecto', '~> 0.0.2')
- gem.add_runtime_dependency('abstract_type', '~> 0.0.4')
- gem.add_runtime_dependency('rspec-core', '~> 2.13.0')
- gem.add_runtime_dependency('diff-lcs', '~> 1.2.1')
gem.add_runtime_dependency('anima', '~> 0.0.5')
+ gem.add_runtime_dependency('rspec', '~> 2.13.0')
end

2 comments on commit 363ae0c

Collaborator

dkubb replied Apr 17, 2013

@mbj can the release-v0.2.20 branch be safely removed now that it is part of master?

Owner

mbj replied Apr 17, 2013

@dkubb Yes it can be removed. Done.

Please sign in to comment.