summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2010-08-13 00:27:58 +0200
committerFlorian Frank <flori@ping.de>2010-08-18 03:42:57 +0200
commit2bc58ce2827fba8bd6890ad6d9085d54ba169c6a (patch)
tree777be0fded5c551e1323e5a79b995130950421bb /lib
parent6ed5e19ef82df3f33a358c676c344009ac59d7a2 (diff)
downloadjson-2bc58ce2827fba8bd6890ad6d9085d54ba169c6a.tar.gz
prepare new version
fixed some warnings wrote some rake tasks to build jruby extension
Diffstat (limited to 'lib')
-rw-r--r--lib/json/ext.rb2
-rw-r--r--lib/json/pure.rb2
-rw-r--r--lib/json/version.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/json/ext.rb b/lib/json/ext.rb
index 719e560..a6b353d 100644
--- a/lib/json/ext.rb
+++ b/lib/json/ext.rb
@@ -6,7 +6,7 @@ module JSON
module Ext
require 'json/ext/parser'
require 'json/ext/generator'
- $DEBUG and warn "Using c extension for JSON."
+ $DEBUG and warn "Using Ext extension for JSON."
JSON.parser = Parser
JSON.generator = Generator
end
diff --git a/lib/json/pure.rb b/lib/json/pure.rb
index 565ef0c..1848f03 100644
--- a/lib/json/pure.rb
+++ b/lib/json/pure.rb
@@ -68,7 +68,7 @@ module JSON
# This module holds all the modules/classes that implement JSON's
# functionality in pure ruby.
module Pure
- $DEBUG and warn "Using pure library for JSON."
+ $DEBUG and warn "Using Pure library for JSON."
JSON.parser = Parser
JSON.generator = Generator
end
diff --git a/lib/json/version.rb b/lib/json/version.rb
index a369b6c..beff08b 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.4.6'
+ VERSION = '1.5.0'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: