reorganized project into Android Studio-standard structure

README.markdown

@@ -44,7 +44,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.commonsware.cwac:merge:1.1.+'
+    compile 'com.commonsware.cwac:merge:1.1.2'
 }
 ```
 
@@ -152,6 +152,11 @@ please post an [issue](https://github.com/commonsguy/cwac-merge/issues),
 with enough information to reproduce the use case and therefore confirm that
 a modified `MergeAdapter` does what it is supposed to.
 
+### JavaDocs
+
+[JavaDocs are available](http://javadocs.commonsware.com/cwac/merge/index.html)
+for your JavaDocing pleasure.
+
 Dependencies
 ------------
 This project requires the [CWAC SackOfViewsAdapter][sacklist].
@@ -166,7 +171,7 @@ that do not work on API Level 4 and are not noted as requiring a higher version.
 
 Version
 -------
-This is version v1.1.1 of this module.
+This is version v1.1.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.
@@ -189,7 +194,7 @@ 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
+on [Stack Overflow](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.
@@ -200,10 +205,16 @@ The [contribution guidelines](CONTRIBUTING.md)
 provide some suggestions for how to create a bug report that will get
 the problem fixed the fastest.
 
-Do not ask for help via Twitter.
+You are also welcome to join
+[the CommonsWare Community](https://community.commonsware.com/)
+and post questions
+and ideas to [the CWAC category](https://community.commonsware.com/c/cwac).
+
+Do not ask for help via social media.
 
 Release Notes
 -------------
+- v1.1.2: reorganized project into Android Studio-standard structure
 - v1.1.1: updated for Android Studio 1.0 and new AAR publishing system
 - v1.1.0: added `android:minSdkVersion` to library manifest
 - v1.0.4: added `cwac-` prefix to JAR

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

demo/build.gradle

@@ -8,25 +8,10 @@ repositories {
 
 dependencies {
     debugCompile project(':merge')
-    releaseCompile 'com.commonsware.cwac:merge:1.1.+'
+    releaseCompile 'com.commonsware.cwac:merge:1.1.2'
 }
 
 android {
-    compileSdkVersion 17
-    buildToolsVersion "19.1.0"
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Dec 07 07:34:35 EST 2014
+#Fri Dec 16 16:30:56 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

merge/build.gradle

@@ -7,27 +7,12 @@ repositories {
 }
 
 dependencies {
-    compile 'com.commonsware.cwac:sacklist:1.0.+'
+    compile 'com.commonsware.cwac:sacklist:1.0.3'
 }
 
 android {
-    compileSdkVersion 17
-    buildToolsVersion "19.1.0"
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 }
 
 if (project.hasProperty('PUBLISH_GROUP_ID')) {
@@ -46,6 +31,27 @@ if (project.hasProperty('PUBLISH_GROUP_ID')) {
         task.exclude('com/commonsware/cwac/**/BuildConfig.**')
     }
 
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError  false
+        source = android.sourceSets.main.java.sourceFiles
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+
+    artifacts {
+        archives sourcesJar
+        archives javadocJar
+    }
+
     apply plugin: 'maven'
 
     uploadArchives {