summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2021-04-06 20:38:58 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2021-04-06 20:38:58 -0700
commit6a92b9c932d6e54cfd452bb49d693f6a53b38b7d (patch)
treec32497c899c43c4f63f07d08596a7476db4e4dc9
parentf282d5b9fcaa9b91280160fd9636fc2d5e73ae11 (diff)
downloadffi-yajl-6a92b9c932d6e54cfd452bb49d693f6a53b38b7d.tar.gz
Mostly removing the libyajl2 pin2.4.0
Some Gemfile cleanup and bumping the version Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile12
-rw-r--r--ffi-yajl.gemspec2
-rw-r--r--ffi-yajl.gemspec.shared7
-rw-r--r--lib/ffi_yajl/version.rb4
4 files changed, 9 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index 3941abb..30fe201 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,15 @@ source "https://rubygems.org"
gemspec name: "ffi-yajl"
-platforms :rbx do
- gem "rubysl", "~> 2.0"
-end
-
group :development do
# for testing loading concurrently with yajl-ruby, not on jruby
# gem 'yajl-ruby', platforms: [ :ruby, :mswin, :mingw ]
- gem "rspec"
- gem "rake-compiler"
+ gem "ffi"
+ gem "rake", ">= 10.1"
+ gem "rspec", "~> 3.0"
+ gem "pry", "~> 0.9"
+ gem "rake-compiler", "~> 1.0"
+ gem "rack", "~> 2.0"
end
group :development_extras do
diff --git a/ffi-yajl.gemspec b/ffi-yajl.gemspec
index 83af1f6..98c272a 100644
--- a/ffi-yajl.gemspec
+++ b/ffi-yajl.gemspec
@@ -3,6 +3,4 @@ gemspec = eval(IO.read(File.expand_path(File.join(File.dirname(__FILE__), "ffi-y
gemspec.platform = Gem::Platform::RUBY
gemspec.extensions = %w{ext/ffi_yajl/ext/encoder/extconf.rb ext/ffi_yajl/ext/parser/extconf.rb ext/ffi_yajl/ext/dlopen/extconf.rb}
-gemspec.add_development_dependency "ffi", "~> 1.5"
-
gemspec
diff --git a/ffi-yajl.gemspec.shared b/ffi-yajl.gemspec.shared
index 5ebe2a9..3d4ab74 100644
--- a/ffi-yajl.gemspec.shared
+++ b/ffi-yajl.gemspec.shared
@@ -14,12 +14,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.2"
- s.add_development_dependency "rake", ">= 10.1"
- s.add_development_dependency "rspec", "~> 3.0"
- s.add_development_dependency "pry", "~> 0.9"
- s.add_development_dependency "rake-compiler", "~> 1.0"
- s.add_development_dependency "rack", "~> 2.0"
- s.add_dependency "libyajl2", "~> 1.2"
+ s.add_dependency "libyajl2", ">= 1.2"
s.bindir = "bin"
s.executables = %w{ ffi-yajl-bench }
diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb
index 167606f..9ad6448 100644
--- a/lib/ffi_yajl/version.rb
+++ b/lib/ffi_yajl/version.rb
@@ -1,5 +1,5 @@
# Copyright (c) 2015 Lamont Granquist
-# Copyright (c) 2015-2017, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,5 +21,5 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module FFI_Yajl
- VERSION = "2.3.4".freeze
+ VERSION = "2.4.0".freeze
end