Permalink
Browse files

merged master

  • Loading branch information...
2 parents 6754af4 + bae5758 commit f23a946dac3d4190cae238fac597c4a45f6ecd53 Tom Bollwitt committed Dec 27, 2012
Showing with 768 additions and 245 deletions.
  1. +19 −0 README.asciidoc
  2. +0 −7 README.txt
  3. +131 −178 pom.xml
  4. +9 −3 src/main/java/com/jayway/maven/plugins/android/AbstractAndroidMojo.java
  5. +9 −4 src/main/java/com/jayway/maven/plugins/android/AbstractInstrumentationMojo.java
  6. +31 −12 src/main/java/com/jayway/maven/plugins/android/AndroidSdk.java
  7. +43 −0 src/main/java/com/jayway/maven/plugins/android/configuration/Manifest.java
  8. +7 −6 src/main/java/com/jayway/maven/plugins/android/manifmerger/ManifestMerger.java
  9. +9 −5 src/main/java/com/jayway/maven/plugins/android/manifmerger/MergerInitializerFactory.java
  10. +3 −1 src/main/java/com/jayway/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java
  11. +9 −2 src/main/java/com/jayway/maven/plugins/android/phase05compile/NdkBuildMojo.java
  12. +63 −0 src/main/java/com/jayway/maven/plugins/android/phase09package/ApkMojo.java
  13. +236 −15 src/main/java/com/jayway/maven/plugins/android/standalonemojos/ManifestUpdateMojo.java
  14. +23 −3 src/main/java/com/jayway/maven/plugins/android/standalonemojos/RunMojo.java
  15. +20 −5 src/test/java/com/jayway/maven/plugins/android/standalonemojos/ManifestUpdateMojoTest.java
  16. +12 −0 src/test/resources/manifest-tests/application-changes/AndroidManifest-expected.xml
  17. +23 −0 src/test/resources/manifest-tests/application-changes/AndroidManifest.xml
  18. +43 −0 src/test/resources/manifest-tests/application-changes/plugin-config.xml
  19. +2 −2 src/test/resources/manifest-tests/basic-android-project-manifest/AndroidManifest-expected.xml
  20. +2 −2 ...test/resources/manifest-tests/differentLengthVersion-android-project/AndroidManifest-expected.xml
  21. +12 −0 src/test/resources/manifest-tests/provider-authorities-project/AndroidManifest-expected.xml
  22. +12 −0 src/test/resources/manifest-tests/provider-authorities-project/AndroidManifest.xml
  23. +50 −0 src/test/resources/manifest-tests/provider-authorities-project/plugin-config.xml
View
@@ -0,0 +1,19 @@
+
+== ANDROID MAVEN PLUGIN
+
+A plugin for Android application development with http://maven.apache.org[Apache Maven 3.0.3+] and
+the http://tools.android.com[Android SDK].
+
+=== Links
+
+* http://code.google.com/p/maven-android-plugin[Project site] with wiki and more
+* http://code.google.com/p/maven-android-plugin/issues/list[Issue tracker]
+* http://maven-android-plugin-m2site.googlecode.com/svn/index.html[Maven generated plugin documentation site]
+* http://www.sonatype.com/books/mvnref-book/reference/android-dev.html[Maven: Complete Reference - Chapter - Android Application Development with Maven]
+* https://groups.google.com/forum/?fromgroups#!forum/maven-android-developers[Mailinglist]
+* http://code.google.com/p/maven-android-plugin/wiki/Changelog[Changelog]
+* http://jenkins.josefson.org/[Continuous Integration Server Builds]
+
+=== Contributions
+
+We welcome your feature enhancements and bug fixes in pull requests!
View
@@ -1,7 +0,0 @@
-===============================================================================
-ANDROID MAVEN PLUGIN
-===============================================================================
-
-The project home page is at http://code.google.com/p/maven-android-plugin
-
-All documentation is there.
Oops, something went wrong.

0 comments on commit f23a946

Please sign in to comment.