summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2012-01-15 14:57:14 +0100
committerFlorian Frank <flori@ping.de>2012-01-15 14:57:14 +0100
commit29e88befe5335134d03e91f9943fc7fe9732da71 (patch)
tree8aec6a3cd43b0bad87dfa3985734d0f7eae84043
parente4e5a2bf48028b92595f5625d6dfc7553c696053 (diff)
downloadjson-29e88befe5335134d03e91f9943fc7fe9732da71.tar.gz
Prepare new versionv1.6.5
-rw-r--r--CHANGES5
-rw-r--r--VERSION2
-rw-r--r--json.gemspec6
-rw-r--r--json_pure.gemspec6
-rw-r--r--lib/json/version.rb2
5 files changed, 13 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES
index 50f3bc6..c0a61a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2012-01-15 (1.6.5)
+ * Vit Ondruch <v.ondruch@tiscali.cz> reported a bug that shows up when using
+ optimisation under GCC 4.7. Thx to him, Bohuslav Kabrda
+ <bkabrda@redhat.com> and Yui NARUSE <naruse@airemix.jp> for debugging and
+ developing a patch fix.
2011-12-24 (1.6.4)
* Patches that improve speed on JRuby contributed by Charles Oliver Nutter
<headius@headius.com>.
diff --git a/VERSION b/VERSION
index 9edc58b..9f05f9f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/json.gemspec b/json.gemspec
index e34aec2..3869c4d 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = "json"
- s.version = "1.6.4"
+ s.version = "1.6.5"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2011-12-24"
+ s.date = "2012-01-15"
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"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"]
s.require_paths = ["ext/json/ext", "ext", "lib"]
s.rubyforge_project = "json"
- s.rubygems_version = "1.8.13"
+ s.rubygems_version = "1.8.15"
s.summary = "JSON Implementation for Ruby"
s.test_files = ["./tests/test_json_string_matching.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_unicode.rb", "./tests/test_json_addition.rb", "./tests/test_json_generate.rb", "./tests/test_json_encoding.rb", "./tests/test_json.rb"]
diff --git a/json_pure.gemspec b/json_pure.gemspec
index 9e10161..7e83339 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.6.4"
+ s.version = "1.6.5"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2011-12-24"
+ s.date = "2012-01-15"
s.description = "This is a JSON implementation in pure Ruby."
s.email = "flori@ping.de"
s.extra_rdoc_files = ["README.rdoc"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
s.require_paths = ["lib"]
s.rubyforge_project = "json"
- s.rubygems_version = "1.8.13"
+ s.rubygems_version = "1.8.15"
s.summary = "JSON Implementation for Ruby"
s.test_files = ["./tests/test_json_string_matching.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_unicode.rb", "./tests/test_json_addition.rb", "./tests/test_json_generate.rb", "./tests/test_json_encoding.rb", "./tests/test_json.rb"]
diff --git a/lib/json/version.rb b/lib/json/version.rb
index 6839915..2295563 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.6.4'
+ VERSION = '1.6.5'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: