fixed manifest to better handle manifest merging

README.markdown

@@ -42,7 +42,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.commonsware.cwac:merge:1.0.1'
+    compile 'com.commonsware.cwac:merge:1.0.2'
 }
 ```
 
@@ -155,15 +155,16 @@ Dependencies
 This project requires the [CWAC SackOfViewsAdapter][sacklist].
 A copy of a compatible JAR can be found in the `libs/` directory of
 the project, though you are welcome to try newer ones, or
-ones that you have patched yourself.
+ones that you have patched yourself. Users of the AAR artifact will automatically
+download this dependency.
 
 This project should work on API Level 4 and higher, except for any portions that
 may be noted otherwise in this document. Please report bugs if you find features
 that do not work on API Level 4 and are not noted as requiring a higher version.
 
 Version
 -------
-This is version v1.0.1 of this module.
+This is version v1.0.2 of this module.
 
 For those of you updating from a previous version, please note that you need
 a new edition of the `SackOfViewsAdapter` JAR as well.
@@ -186,7 +187,8 @@ file.
 Questions
 ---------
 If you have questions regarding the use of this code, please post a question
-on [StackOverflow](http://stackoverflow.com/questions/ask) tagged with `commonsware` and `android`. Be sure to indicate
+on [StackOverflow](http://stackoverflow.com/questions/ask) tagged with
+`commonsware-cwac` and `android` after [searching to see if there already is an answer](https://stackoverflow.com/search?q=[android]+mergeadapter). Be sure to indicate
 what CWAC module you are having issues with, and be sure to include source code 
 and stack traces if you are encountering crashes.
 
@@ -197,6 +199,7 @@ Do not ask for help via Twitter.
 
 Release Notes
 -------------
+- v1.0.2: fixed manifest to better handle manifest merging
 - v1.0.1: added Gradle files and published AAR
 - v1.0.0: milestone considered reached
 - v0.4.0: added `setActive()`

demo/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.11.+'
     }
 }
 
@@ -16,12 +16,12 @@ repositories {
 }
 
 dependencies {
-    compile 'com.commonsware.cwac:merge:1.0.1'
+    compile 'com.commonsware.cwac:merge:1.0.+'
 }
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "18.1.0"
+    buildToolsVersion "19.1.0"
 
     sourceSets {
         main {

merge/AndroidManifest.xml

@@ -4,7 +4,4 @@
 	android:versionCode="1"
 	android:versionName="1.0">
 
-	<application android:allowBackup="false">
-	</application>
-
-</manifest>
+</manifest>

merge/build.gradle

@@ -3,15 +3,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.11.+'
         classpath 'com.github.dcendents:android-maven-plugin:1.0'
     }
 }
 
 apply plugin: 'android-library'
 apply plugin: 'android-maven'
 
-version '1.0.1'
+version '1.0.2'
 group 'com.commonsware.cwac'
 
 repositories {
@@ -27,7 +27,7 @@ dependencies {
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "18.1.0"
+    buildToolsVersion "19.1.0"
 
     sourceSets {
         main {
@@ -49,7 +49,7 @@ android {
 
 android.libraryVariants.all { variant ->
   def name = variant.buildType.name
-  if (name.equals(com.android.builder.BuilderConstants.DEBUG)) {
+  if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) {
     return; // Skip debug builds.
   }
   def task = project.tasks.create "jar${name.capitalize()}", Jar