Skip to content

Commit

Permalink
Merge pull request #14 from CocoaPods/colored2
Browse files Browse the repository at this point in the history
Migrate to colored2 instead of unmaintained colored
  • Loading branch information
endocrimes authored Jan 30, 2017
2 parents 33da8ed + 8dc9f46 commit 0f5d6f9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

##### Enhancements

* None.
* Use the colored2 gem instead of colored.
[Orta Therox](https://github.com/orta)
[xcodeproj#463](https://github.com/CocoaPods/Xcodeproj/pull/463)

##### Bug Fixes

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
cork (0.2.0)
colored (~> 1.2)
colored2 (~> 3.1)

GEM
remote: https://rubygems.org/
Expand All @@ -15,7 +15,7 @@ GEM
json
simplecov
url
colored (1.2)
colored2 (3.1.1)
docile (1.1.5)
json (1.8.3)
metaclass (0.0.4)
Expand Down Expand Up @@ -59,4 +59,4 @@ DEPENDENCIES
rubocop

BUNDLED WITH
1.12.5
1.13.6
2 changes: 1 addition & 1 deletion cork.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |s|

s.require_paths = %w{ lib }

s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'colored2', '~> 3.1'

s.add_development_dependency 'bundler', '~> 1.3'
s.add_development_dependency 'rake', '>= 10.0'
Expand Down
2 changes: 1 addition & 1 deletion lib/cork/board.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'colored'
require 'colored2'

module Cork
# provides support for UI output. Cork provides support for nested
Expand Down

0 comments on commit 0f5d6f9

Please sign in to comment.