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.

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

Gradle Cleanup #623

Merged
merged 7 commits into from
Feb 12, 2014
Merged

Gradle Cleanup #623

merged 7 commits into from
Feb 12, 2014

Conversation

zumbrunnen
Copy link
Member

SAFE TO MERGE NOW (I pushed recent subproject commit refs to this PR as DroidPlanner/usb-serial-for-android#2 and https://github.com/DroidPlanner/HorizontalVariableListView/pull/3 are merged now.)

Follow up to #619

  • Removed *.iml from version control as they contain too much local data and thus changing arbitrarily
  • Ignoring sub project 'google-play-services_lib' and added them as Maven dependencies
  • Mavlink/Google Play Services: API updated (forgot that in previous PR)

With this PR, the project can be imported in Android Studio hassle-free:

  • Prepare a clean clone with updated submodules
  • Import project in Android Studio
  • Sync from Gradle Files
  • Build & Run

David Zumbrunnen and others added 6 commits January 31, 2014 17:59
They contain too much local info and change arbitrarily
 * Android Support as a Maven dependency
 * Removed UsbSerialLibrary include from settings.gradle
 * Removed Play Services dependency for Mavlink
... and adding the dependencies directly in the main project
@arthurbenemann arthurbenemann mentioned this pull request Feb 11, 2014
@zumbrunnen
Copy link
Member Author

@arthurbenemann Thanks for merging the PRs for the submodules. I just added a commit with the updated submodule references, so this PR could be merged now.

arthurbenemann added a commit that referenced this pull request Feb 12, 2014
@arthurbenemann arthurbenemann merged commit 6647767 into DroidPlanner:master Feb 12, 2014
@zumbrunnen zumbrunnen deleted the gradle_cleanup branch February 18, 2014 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants