summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--VERSION2
-rw-r--r--json.gemspec4
-rw-r--r--json_pure.gemspec4
-rw-r--r--lib/json/version.rb2
5 files changed, 9 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 3dfa4f0..6d8533b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2012-05-11 (1.7.2)
+ * Fix some encoding issues, that cause problems for the pure and the
+ extension variant in jruby 1.9 mode.
2012-04-28 (1.7.1)
* Some small fixes for building
2012-04-28 (1.7.0)
diff --git a/VERSION b/VERSION
index 943f9cb..f8a696c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.1
+1.7.2
diff --git a/json.gemspec b/json.gemspec
index d351e5c..5b1a696 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = "json"
- s.version = "1.7.1"
+ s.version = "1.7.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2012-05-09"
+ s.date = "2012-05-11"
s.description = "This is a JSON implementation as a Ruby extension in C."
s.email = "flori@ping.de"
s.extensions = ["ext/json/ext/parser/extconf.rb", "ext/json/ext/generator/extconf.rb"]
diff --git a/json_pure.gemspec b/json_pure.gemspec
index e0bc321..eb8bc34 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = "json_pure"
- s.version = "1.7.1"
+ s.version = "1.7.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2012-05-09"
+ s.date = "2012-05-11"
s.description = "This is a JSON implementation in pure Ruby."
s.email = "flori@ping.de"
s.extra_rdoc_files = ["README.rdoc"]
diff --git a/lib/json/version.rb b/lib/json/version.rb
index b1cf47f..d6bf808 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.7.1'
+ VERSION = '1.7.2'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: