-
-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
[TIMOB-23526] Locks down the version of cocoapod hyperloop uses. #35
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
source 'https://rubygems.org' | ||
|
||
gem 'cocoapods', '0.38.0' | ||
|
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 |
---|---|---|
@@ -0,0 +1,62 @@ | ||
GEM | ||
remote: https://rubygems.org/ | ||
specs: | ||
activesupport (4.2.6) | ||
i18n (~> 0.7) | ||
json (~> 1.7, >= 1.7.7) | ||
minitest (~> 5.1) | ||
thread_safe (~> 0.3, >= 0.3.4) | ||
tzinfo (~> 1.1) | ||
claide (0.9.1) | ||
cocoapods (0.38.0) | ||
activesupport (>= 3.2.15) | ||
claide (~> 0.9.1) | ||
cocoapods-core (= 0.38.0) | ||
cocoapods-downloader (~> 0.9.1) | ||
cocoapods-plugins (~> 0.4.2) | ||
cocoapods-stats (~> 0.5.3) | ||
cocoapods-trunk (~> 0.6.1) | ||
cocoapods-try (~> 0.4.5) | ||
colored (~> 1.2) | ||
escape (~> 0.0.4) | ||
molinillo (~> 0.3.0) | ||
nap (~> 0.8) | ||
xcodeproj (~> 0.26.2) | ||
cocoapods-core (0.38.0) | ||
activesupport (>= 3.2.15) | ||
fuzzy_match (~> 2.0.4) | ||
nap (~> 0.8.0) | ||
cocoapods-downloader (0.9.3) | ||
cocoapods-plugins (0.4.2) | ||
nap | ||
cocoapods-stats (0.5.3) | ||
nap (~> 0.8) | ||
cocoapods-trunk (0.6.4) | ||
nap (>= 0.8, < 2.0) | ||
netrc (= 0.7.8) | ||
cocoapods-try (0.4.5) | ||
colored (1.2) | ||
escape (0.0.4) | ||
fuzzy_match (2.0.4) | ||
i18n (0.7.0) | ||
json (1.8.3) | ||
minitest (5.9.0) | ||
molinillo (0.3.1) | ||
nap (0.8.0) | ||
netrc (0.7.8) | ||
thread_safe (0.3.5) | ||
tzinfo (1.2.2) | ||
thread_safe (~> 0.1) | ||
xcodeproj (0.26.3) | ||
activesupport (>= 3) | ||
claide (~> 0.9.1) | ||
colored (~> 1.2) | ||
|
||
PLATFORMS | ||
ruby | ||
|
||
DEPENDENCIES | ||
cocoapods (= 0.38.0) | ||
|
||
BUNDLED WITH | ||
1.11.2 |
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 |
---|---|---|
|
@@ -596,9 +596,22 @@ function getCocoaPodsXCodeSettings (basedir) { | |
function isPodInstalled (callback) { | ||
var exec = require('child_process').exec; | ||
return exec('which pod', function (err, stdout) { | ||
if (err) { | ||
return callback(new Error('CocoaPods not found in your PATH. You can install CocoaPods with: sudo gem install cocoapods')); | ||
} | ||
if (err) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Indentation |
||
util.logger.info(chalk.green('Bundler') + ' installing CocoaPods gem since we cannot find it in your PATH'); | ||
var spawn = require('child_process').spawn; | ||
var child = spawn('bundle', ['install'], {cwd:basedir}); | ||
createLogger(child.stdout, util.logger.trace); | ||
createLogger(child.stderr, util.logger.warn); | ||
child.on('error', callback); | ||
child.on('exit', function (ec) { | ||
if (ec !== 0) { | ||
return callback(new Error("something went wrong with installing CocoaPods gem. Please check your environment")); | ||
} | ||
fs.writeFileSync(cacheFile, cacheToken); | ||
return callback(); | ||
}); | ||
//return callback(new Error('CocoaPods not found in your PATH. You can install CocoaPods with: sudo gem install cocoapods')); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove unused comment |
||
} | ||
return callback(null, stdout.trim()); | ||
}); | ||
} | ||
|
@@ -617,7 +630,7 @@ function runPodInstallIfRequired(basedir, callback) { | |
util.logger.trace('found pod at ' +pod); | ||
util.logger.info(chalk.green('CocoaPods') + ' dependencies found. This will take a few moments but will be cached for subsequent builds'); | ||
var spawn = require('child_process').spawn; | ||
var child = spawn(pod, ['install', '--no-integrate'], {cwd:basedir}); | ||
var child = spawn('bundle', ['exec', ' pod install --no-integrate'], {cwd:basedir}); | ||
createLogger(child.stdout, util.logger.trace); | ||
createLogger(child.stderr, util.logger.warn); | ||
child.on('error', callback); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this lock-file need to be part of the commit?