summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2012-05-12 00:23:07 +0200
committerFlorian Frank <flori@ping.de>2012-05-12 00:23:07 +0200
commitc1320061ae68a4695d72ce287373ff1e2e2f0022 (patch)
tree1dbcba4e6bb2701d2ab4dc619e4cbdb454a78cfa
parentfde9036047e6d3e0771507a111f07793a7a26761 (diff)
downloadjson-c1320061ae68a4695d72ce287373ff1e2e2f0022.tar.gz
Prepare new 1.7.3 releasev1.7.3
-rw-r--r--CHANGES2
-rw-r--r--VERSION2
-rw-r--r--json.gemspec2
-rw-r--r--json_pure.gemspec2
-rw-r--r--lib/json/version.rb2
5 files changed, 6 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 6d8533b..de07a30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2012-05-12 (1.7.3)
+ * Work around Rubinius encoding issues using iconv for conversion instead.
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.
diff --git a/VERSION b/VERSION
index f8a696c..661e7ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.2
+1.7.3
diff --git a/json.gemspec b/json.gemspec
index 5b1a696..2817b1e 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = "json"
- s.version = "1.7.2"
+ s.version = "1.7.3"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
diff --git a/json_pure.gemspec b/json_pure.gemspec
index eb8bc34..6399283 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = "json_pure"
- s.version = "1.7.2"
+ s.version = "1.7.3"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
diff --git a/lib/json/version.rb b/lib/json/version.rb
index d6bf808..76dc404 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.7.2'
+ VERSION = '1.7.3'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: