Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make pliny compatible with ruby 2.4 #302

Merged
merged 3 commits into from
Feb 15, 2017
Merged

Make pliny compatible with ruby 2.4 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bb1dd8
Make pliny compatible with ruby 2.4
Jan 10, 2017
c6a4f3b
Drop support for ruby > 2.2.2
Jan 10, 2017
b48b2f2
Remove version dependant tests
cyberdelia Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: ruby
rvm:
- 2.4.0
- 2.3.3
- 2.2.0
- 2.1.5
- 2.1.0
- 2.2.2
addons:
postgresql: '9.3'
before_script:
Expand Down
2 changes: 1 addition & 1 deletion pliny.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
gem.executables = %x{ git ls-files }.split("\n").select { |d| d =~ /^bin\// }.map { |d| d.gsub(/^bin\//, "") }
gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(License|README|bin/|data/|ext/|lib/|spec/|test/)} }

gem.add_dependency "activesupport", "~> 4.1", ">= 4.1.0"
gem.add_dependency "activesupport", "~> 5.0", ">= 5.0.1"
gem.add_dependency "multi_json", "~> 1.9", ">= 1.9.3"
gem.add_dependency "prmd", "~> 0.11", ">= 0.11.4"

Expand Down
4 changes: 2 additions & 2 deletions spec/canonical_log_line_helpers_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class TestCanonicalLogLine
it "rejects values that are of the wrong type" do
line = TestCanonicalLogLine.new
e = assert_raises ArgumentError do
line.field_string = 42
line.field_string = true
end
assert_equal "Expected field_string to be type String (was Fixnum)",
assert_equal "Expected field_string to be type String (was TrueClass)",
e.message
end

Expand Down