Skip to content

Commit 17779f1

Browse files
committed
fix dependencies conflic
1 parent 9754524 commit 17779f1

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

Gemfile.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
PATH
22
remote: .
33
specs:
4-
terjira (0.2.8)
4+
terjira (0.2.9)
55
activesupport (= 4.0.13)
66
jira-ruby (~> 1.1.3)
7-
pastel (~> 0.6.1)
87
thor (~> 0.19)
9-
tty-prompt (~> 0.9)
10-
tty-spinner (~> 0.4)
11-
tty-table (~> 0.6)
8+
tty-prompt (~> 0.9.0)
9+
tty-spinner (~> 0.4.1)
10+
tty-table (~> 0.6.0)
1211

1312
GEM
1413
remote: https://rubygems.org/
@@ -19,7 +18,7 @@ GEM
1918
multi_json (~> 1.3)
2019
thread_safe (~> 0.1)
2120
tzinfo (~> 0.3.37)
22-
codeclimate-test-reporter (1.0.3)
21+
codeclimate-test-reporter (1.0.4)
2322
simplecov
2423
coderay (1.1.1)
2524
diff-lcs (1.2.5)
@@ -29,7 +28,7 @@ GEM
2928
jira-ruby (1.1.3)
3029
activesupport
3130
oauth (~> 0.5, >= 0.5.0)
32-
json (1.8.3)
31+
json (2.0.3)
3332
method_source (0.8.2)
3433
minitest (4.7.5)
3534
multi_json (1.12.1)
@@ -56,9 +55,9 @@ GEM
5655
diff-lcs (>= 1.2.0, < 2.0)
5756
rspec-support (~> 3.5.0)
5857
rspec-support (3.5.0)
59-
simplecov (0.11.2)
58+
simplecov (0.12.0)
6059
docile (~> 1.1.0)
61-
json (~> 1.8)
60+
json (>= 1.8, < 3)
6261
simplecov-html (~> 0.10.0)
6362
simplecov-html (0.10.0)
6463
slop (3.6.0)

lib/terjira/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'terjira/utils/file_cache'
22

33
module Terjira
4-
VERSION = '0.2.8'.freeze
4+
VERSION = '0.2.9'.freeze
55

66
class VersionChecker
77
VERSION_CHECK_DURATION = (60 * 60 * 24 * 5).freeze

terjira.gemspec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ Gem::Specification.new do |spec|
2424
spec.add_dependency "jira-ruby", "~> 1.1.3"
2525
spec.add_dependency "activesupport", "4.0.13"
2626

27-
spec.add_dependency "tty-table", "~> 0.6"
28-
spec.add_dependency "tty-prompt", "~> 0.9"
29-
spec.add_dependency "tty-spinner", "~> 0.4"
30-
spec.add_dependency "pastel", "~> 0.6.1"
27+
spec.add_dependency "tty-table", "~> 0.6.0"
28+
spec.add_dependency "tty-prompt", "~> 0.9.0"
29+
spec.add_dependency "tty-spinner", "~> 0.4.1"
3130

3231
spec.add_development_dependency "bundler", "~> 1.11"
3332
spec.add_development_dependency "rake", "~> 10.0"

0 commit comments

Comments
 (0)