-
-
Notifications
You must be signed in to change notification settings - Fork 601
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #353 from jeffh/fix-podspec
Fix podspec from throwAssertion merge
- Loading branch information
Showing
6 changed files
with
65 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # A sample Gemfile | ||
| source "https://rubygems.org" | ||
|
|
||
| gem 'cocoapods' | ||
| gem 'cocoapods', '1.1.0.rc.3' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,69 @@ | ||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
| activesupport (4.2.6) | ||
| activesupport (4.2.7.1) | ||
| i18n (~> 0.7) | ||
| json (~> 1.7, >= 1.7.7) | ||
| minitest (~> 5.1) | ||
| thread_safe (~> 0.3, >= 0.3.4) | ||
| tzinfo (~> 1.1) | ||
| claide (1.0.0) | ||
| cocoapods (1.0.1) | ||
| activesupport (>= 4.0.2) | ||
| claide (>= 1.0.0, < 2.0) | ||
| cocoapods-core (= 1.0.1) | ||
| cocoapods-deintegrate (>= 1.0.0, < 2.0) | ||
| cocoapods-downloader (>= 1.0.0, < 2.0) | ||
| claide (1.0.1) | ||
| cocoapods (1.1.0.rc.3) | ||
| activesupport (>= 4.0.2, < 5) | ||
| claide (>= 1.0.1, < 2.0) | ||
| cocoapods-core (= 1.1.0.rc.3) | ||
| cocoapods-deintegrate (>= 1.0.1, < 2.0) | ||
| cocoapods-downloader (>= 1.1.1, < 2.0) | ||
| cocoapods-plugins (>= 1.0.0, < 2.0) | ||
| cocoapods-search (>= 1.0.0, < 2.0) | ||
| cocoapods-stats (>= 1.0.0, < 2.0) | ||
| cocoapods-trunk (>= 1.0.0, < 2.0) | ||
| cocoapods-try (>= 1.0.0, < 2.0) | ||
| cocoapods-trunk (= 1.1.0.beta.1) | ||
| cocoapods-try (>= 1.1.0, < 2.0) | ||
| colored (~> 1.2) | ||
| escape (~> 0.0.4) | ||
| fourflusher (~> 0.3.0) | ||
| molinillo (~> 0.4.5) | ||
| fourflusher (~> 2.0) | ||
| gh_inspector (~> 1.0) | ||
| molinillo (~> 0.5.1) | ||
| nap (~> 1.0) | ||
| xcodeproj (>= 1.1.0, < 2.0) | ||
| cocoapods-core (1.0.1) | ||
| activesupport (>= 4.0.2) | ||
| xcodeproj (>= 1.3.2, < 2.0) | ||
| cocoapods-core (1.1.0.rc.3) | ||
| activesupport (>= 4.0.2, < 5) | ||
| fuzzy_match (~> 2.0.4) | ||
| nap (~> 1.0) | ||
| cocoapods-deintegrate (1.0.0) | ||
| cocoapods-downloader (1.0.1) | ||
| cocoapods-deintegrate (1.0.1) | ||
| cocoapods-downloader (1.1.1) | ||
| cocoapods-plugins (1.0.0) | ||
| nap | ||
| cocoapods-search (1.0.0) | ||
| cocoapods-stats (1.0.0) | ||
| cocoapods-trunk (1.0.0) | ||
| cocoapods-trunk (1.1.0.beta.1) | ||
| nap (>= 0.8, < 2.0) | ||
| netrc (= 0.7.8) | ||
| cocoapods-try (1.0.0) | ||
| cocoapods-try (1.1.0) | ||
| colored (1.2) | ||
| escape (0.0.4) | ||
| fourflusher (0.3.2) | ||
| fourflusher (2.0.1) | ||
| fuzzy_match (2.0.4) | ||
| gh_inspector (1.0.2) | ||
| i18n (0.7.0) | ||
| json (1.8.3) | ||
| minitest (5.9.0) | ||
| molinillo (0.4.5) | ||
| minitest (5.9.1) | ||
| molinillo (0.5.1) | ||
| nap (1.1.0) | ||
| netrc (0.7.8) | ||
| thread_safe (0.3.5) | ||
| tzinfo (1.2.2) | ||
| thread_safe (~> 0.1) | ||
| xcodeproj (1.1.0) | ||
| xcodeproj (1.3.2) | ||
| activesupport (>= 3) | ||
| claide (>= 1.0.0, < 2.0) | ||
| claide (>= 1.0.1, < 2.0) | ||
| colored (~> 1.2) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| cocoapods | ||
| cocoapods (= 1.1.0.rc.3) | ||
|
|
||
| BUNDLED WITH | ||
| 1.12.3 | ||
| 1.13.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.