From 6b1e528468a32471d252fde94ae16471cd534ec4 Mon Sep 17 00:00:00 2001 From: Florian Frank Date: Fri, 11 Sep 2015 03:26:40 +0200 Subject: Bump version to 1.8.4 and add to CHANGES --- CHANGES | 8 ++++++++ VERSION | 2 +- lib/json/version.rb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 8ffecf7..1434676 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +2015-09-11 (1.8.4) + * There were still some mentions of dual GPL licensing in the source, but JSON + has just the Ruby license that itself includes an explicit dual-licensing + clause that allows covered software to be distributed under the terms of + the Simplified BSD License instead for all ruby versions >= 1.9.3. This is + however a GPL compatible license according to the Free Software Foundation. + I changed these mentions to be consistent with the Ruby license setting in + the gemspec files which were already correct now. 2015-06-01 (1.8.3) * Fix potential memory leak, thx to nobu. 2015-01-08 (1.8.2) diff --git a/VERSION b/VERSION index a7ee35a..bfa363e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.3 +1.8.4 diff --git a/lib/json/version.rb b/lib/json/version.rb index 5a4013d..a4696d8 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.8.3' + VERSION = '1.8.4' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: -- cgit v1.2.1