Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to CocoaPods 1.2.1 #300

Merged
merged 6 commits into from
May 13, 2017
Merged

Move to CocoaPods 1.2.1 #300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae67395
Update Ruby dependencies
garriguv May 12, 2017
cbf1ff5
Use cocoapods 1.2.1
garriguv May 12, 2017
9e541fb
Add colored gem
garriguv May 12, 2017
47a5fbf
Run pod install with new cocoapods 1.2.1
garriguv May 12, 2017
c049dcb
Add cocoapods update to changelog
garriguv May 12, 2017
b8db04c
Update cocoapods-update-if-you-dare
garriguv May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ source 'https://rubygems.org'

gem 'cocoapods'
gem 'cocoapods-update-if-you-dare', '~> 0.1.1'
gem 'colored'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we need a new dependency here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually do, since cocoapods-update-if-you-dare does not specify this dependency explicitly. And cocoapods moved to colored2: CocoaPods/Xcodeproj#463

I opened a PR on the project itself to fix it: Ashton-W/cocoapods-update-if-you-dare#2

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks, @garriguv, I've missed the commit description 😄 And thanks for the PR to the CocoaPods plugin 👍 Maybe the @Ashton-W can merge it soon and release a new version, so we again won't require the colored dependency specified in the gem.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if it's not released soon, the PR looks cool and we could merge it as is. Does it sound fine for you @garriguv ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that sounds good. I'll open another PR to remove colored once Ashton-W/cocoapods-update-if-you-dare#2 is merged and a new version of the gem is released.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just released 0.2.0 for you :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@garriguv I think there is no need for another PR. Just remove colored here from this one and update bundle once again and we're good to go 🚀

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 🚀

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing, congratulations on your first contribution 🎉

gem 'danger'
gem 'rake'
gem 'jazzy'
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ GEM
netrc (= 0.7.8)
cocoapods-try (1.1.0)
cocoapods-update-if-you-dare (0.1.1)
colored (1.2)
colored2 (3.1.2)
cork (0.3.0)
colored2 (~> 3.1)
Expand Down Expand Up @@ -129,6 +130,7 @@ PLATFORMS
DEPENDENCIES
cocoapods
cocoapods-update-if-you-dare (~> 0.1.1)
colored
danger
danger-jazzy
jazzy
Expand Down