Merge pull request #157 from id774/devel

id774 · id774 · commit 16224f5aa194 · 2015-01-03T15:50:31.000+09:00
Version bump to v14.12.1
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,12 @@
-# Version:20141227
+# Version:20150103
 
 source "http://rubygems.org"
 source "http://gems.github.com"
 
 gem 'json'
 gem 'sqlite3'
-gem 'activesupport'
-gem 'activerecord'
+gem 'activesupport', '~> 4.1.0'
+gem 'activerecord', '~> 4.1.0'
 gem 'hashie'
 gem 'gcalapi'
 gem 'xml-simple'
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-14.12.0
+14.12.1
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,8 @@
+=== 14.12.1 / 2015-01-03
+
+* Fix Gemfile problem
+
+
 === 14.12.0 / 2014-12-27
 
 * Rewrite obsolete methods.
diff --git a/lib/automatic/version.rb b/lib/automatic/version.rb
@@ -1,3 +1,3 @@
 module Automatic
-  VERSION = "14.12.0-devel"
+  VERSION = "14.12.1"
 end
diff --git a/spec/lib/automatic_spec.rb b/spec/lib/automatic_spec.rb
@@ -3,8 +3,8 @@
 # Author::    kzgs
 #             774 <http://id774.net>
 # Created::   Mar  9, 2012
-# Updated::   Dec 30, 2014
-# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
+# Updated::   Jan  3, 2015
+# Copyright:: Copyright (c) 2012-2015 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
@@ -27,7 +27,7 @@
   describe "#version" do
     subject { Automatic.const_get(:VERSION) }
 
-    it { expect(subject).to eq "14.12.0-devel" }
+    it { expect(subject).to eq "14.12.1" }
   end
 
   describe "#(root)_dir" do
