summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2013-10-17 09:03:37 +0200
committerFlorian Frank <flori@ping.de>2013-10-17 09:03:37 +0200
commita9b1820cd2c627e1ea4db9bb686012776a1a485c (patch)
tree986d54cc0faa8185a4033cb23cb131093146ecdf
parentffbd6dca7bfbe5161ba9467e130a1246363e8fb3 (diff)
downloadjson-a9b1820cd2c627e1ea4db9bb686012776a1a485c.tar.gz
New version 1.8.1
-rw-r--r--.gitignore1
-rw-r--r--CHANGES2
-rw-r--r--VERSION2
-rw-r--r--json.gemspec7
-rw-r--r--json_pure.gemspec7
-rw-r--r--lib/json/version.rb2
6 files changed, 13 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index c810962..297633e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Gemfile.lock
*.rbc
.rbx
.AppleDouble
+.DS_Store
diff --git a/CHANGES b/CHANGES
index edccaee..6a67cfc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2013-05-13 (1.8.1)
+ * Remove Rubinius exception since transcoding should be working now.
2013-05-13 (1.8.0)
* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
Lafortune <github_rocks@marc-andre.ca>. Thanks!
diff --git a/VERSION b/VERSION
index 27f9cd3..a8fdfda 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.0
+1.8.1
diff --git a/json.gemspec b/json.gemspec
index 057756d..a970ad5 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -1,12 +1,13 @@
# -*- encoding: utf-8 -*-
+# stub: json 1.8.1 ruby lib
Gem::Specification.new do |s|
s.name = "json"
- s.version = "1.8.0"
+ s.version = "1.8.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2013-05-13"
+ s.date = "2013-10-17"
s.description = "This is a JSON implementation as a Ruby extension in C."
s.email = "flori@ping.de"
s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
@@ -16,7 +17,7 @@ Gem::Specification.new do |s|
s.licenses = ["Ruby"]
s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"]
s.require_paths = ["lib"]
- s.rubygems_version = "2.0.3"
+ s.rubygems_version = "2.1.4"
s.summary = "JSON Implementation for Ruby"
s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
diff --git a/json_pure.gemspec b/json_pure.gemspec
index 2185202..7d05093 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -1,12 +1,13 @@
# -*- encoding: utf-8 -*-
+# stub: json_pure 1.8.1 ruby lib
Gem::Specification.new do |s|
s.name = "json_pure"
- s.version = "1.8.0"
+ s.version = "1.8.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2013-05-13"
+ s.date = "2013-10-17"
s.description = "This is a JSON implementation in pure Ruby."
s.email = "flori@ping.de"
s.extra_rdoc_files = ["README.rdoc"]
@@ -15,7 +16,7 @@ Gem::Specification.new do |s|
s.licenses = ["Ruby"]
s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
s.require_paths = ["lib"]
- s.rubygems_version = "2.0.3"
+ s.rubygems_version = "2.1.4"
s.summary = "JSON Implementation for Ruby"
s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
diff --git a/lib/json/version.rb b/lib/json/version.rb
index 9354845..47cdcd6 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.8.0'
+ VERSION = '1.8.1'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: