Skip to content

Commit

Permalink
Merge pull request #301 from metricfu/update_gemfile
Browse files Browse the repository at this point in the history
Bump to 4.13.0
  • Loading branch information
bronzdoc authored Jun 3, 2020
2 parents ee7545b + 6c8fa07 commit 21ad430
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 20 deletions.
34 changes: 17 additions & 17 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# encoding: utf-8
source "https://rubygems.org"

if RUBY_VERSION =~ /^2\.2\.[0-1]p?\d*/ || RUBY_VERSION =~ /^2\.1\.\d*p?\d*/
gem "activesupport", "~> 4.2"
gem "json", "~> 1.7"
gem "rubocop", platforms: :mri, groups: [:test, :local_development]
elsif RUBY_VERSION =~ /^2\.0\..*/
gem "activesupport", "~> 4.2"
gem "json", "~> 1.7"
gem "unparser", "0.2.4"
if RUBY_VERSION >= '1.9.3'
gem "rubocop", platforms: :mri, groups: [:test, :local_development]
elsif RUBY_VERSION =~ /^1\.9\.3.*/
gem "activesupport", "~> 4.2"
gem "json", "~> 1.7"
gem "unparser", "0.2.4"
gem "json_pure", "2.0.1"
gem "mime-types", "2.99.3"
gem "rest-client", "1.8.0"
gem "rubocop", platforms: :mri, groups: [:test, :local_development]
gem "addressable", "2.4.0"
gem "ffi", "1.9.14" # windows support

if RUBY_VERSION > '2.3'
gem "json", ">= 2.0"
else
gem "json", "~> 1.7"
end
if RUBY_VERSION =~ /^2\.0\..*/
gem "unparser", "0.2.4"
elsif RUBY_VERSION =~ /^1\.9\.3.*/
gem "unparser", "0.2.4"
gem "json_pure", "2.0.1"
gem "mime-types", "2.99.3"
gem "rest-client", "1.8.0"
gem "addressable", "2.4.0"
gem "ffi", "1.9.14" # windows support
end
elsif RUBY_VERSION =~ /^1\.9\.2.*/
# because of https://github.com/railsbp/rails_best_practices/blob/master/rails_best_practices.gemspec
gem "activesupport", "~> 3.2"
Expand Down
9 changes: 7 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ Each change should fall into categories that would affect whether the release is

As such, a _Feature_ would map to either major (breaking change) or minor. A _bug fix_ to a patch. And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history. Adding tests would be patch level.

### Unreleased
### [Unreleased](https://github.com/metricfu/metric_fu/compare/v4.13.0...master)

* Breaking Changes
* Features
* Fixes
* Misc

### [4.13.0](https://github.com/metricfu/metric_fu/compare/v4.12.0...v4.13.0)

* Features
* Setup CI pipeline on AppVeyor and fixed specs. (Rasmus Bergholdt, #285, fixes #284)
* Upgraded roodi to v5.0.0 (Jonathan Keam, #287)
Expand All @@ -21,7 +27,6 @@ As such, a _Feature_ would map to either major (breaking change) or minor. A _bu
* Misc
* Add a Gitter chat badge to README.md (#259)


### [4.12.0](https://github.com/metricfu/metric_fu/compare/v4.11.4...v4.12.0)

* Features
Expand Down
2 changes: 1 addition & 1 deletion lib/metric_fu/version.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module MetricFu
class Version
MAJOR = "4"
MINOR = "12"
MINOR = "13"
PATCH = "0"
PRE = ""
end
Expand Down

0 comments on commit 21ad430

Please sign in to comment.