Merge release in master #1352
Merged
Merge release in master #1352
Conversation
This file contains hidden or 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
Add baseConfig option that can be used to replace the default AndroidManifest.xml / Info.plist that is used for merge. It should be passed to all build related commands. It can be passed to platform add command as well.
…-option-release Add baseConfig option
Don't stop adb uninstall
Bump up version to 1.5.2
Fixes #1210
Fix ENOENT err
Allow building of projects with spaces in directory names on Windows
Fix spelling
…ories Prepare empty directories
This will resolve the problem with endless loop when the application has before-prepare hook that modifies some files from app folder.
Skip files that are not changed from sync
…-lib Update to latest common lib
Changelog for 1.5.2 release
…o endless loop for CLI. Since the underlying emulation engine for Genymotion is VirtualBox and that's not going to change any time soon, I've added a check for ro.build.product property.
Fix geny 2.6
Update System Requirements for Android development according to 1.5.x changes.
Update docs for Genymotion 2.6
Update System Requirements for Android development
CocoaPods.md -> the CocoaPods article
Conflicts: PLUGINS.md lib/common package.json
`logger` has been required in common lib, but due to some Proton requirements, it should be required from each CLI. Fix this by adding it to bootstrap and update to latest common lib.
|
Test PASSed. |
|
👍 |
rosen-vladimirov
added a commit
that referenced
this pull request
Dec 15, 2015
Merge release in master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge release in master.
Conflicts:
PLUGINS.md
lib/common
package.json
Require logger in CLI, not in common lib
loggerhas been required in common lib, but due to some Proton requirements, it should be required from each CLI.Fix this by adding it to bootstrap and update to latest common lib.