Merge branch 'develop'

Author: keyboardsurfer

build.gradle

@@ -24,7 +24,7 @@ version = '1.8.5'
     }
 
     dependencies {
-      classpath 'com.android.tools.build:gradle:0.11.1'
+      classpath 'com.android.tools.build:gradle:0.12.0'
       classpath 'com.github.dcendents:android-maven-plugin:1.0'
     }
   }
@@ -36,6 +36,6 @@ version = '1.8.5'
 }
 
 task wrapper(type: Wrapper) {
-  description "Generates the gradle wrapper"
-  gradleVersion = "1.12"
+  description 'Generates the gradle wrapper'
+  gradleVersion = '1.12'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Jun 24 02:33:49 CEST 2014
+#Fri Jul 11 10:05:20 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 apply plugin: 'android-maven'
 apply plugin: 'signing'
 
@@ -22,10 +22,10 @@ dependencies {
 }
 
 android {
-  buildToolsVersion '19.1.0'
+  buildToolsVersion '20.0.0'
   compileSdkVersion 19
   defaultConfig {
-    versionCode 7
+    versionCode 10
     versionName = project.version
     minSdkVersion 8
     targetSdkVersion 19
@@ -37,36 +37,39 @@ android {
   }
 }
 
-group = "de.keyboardsurfer.android.widget"
-artifactId = "crouton"
+group = 'de.keyboardsurfer.android.widget'
+artifactId = 'crouton'
 
 android.libraryVariants.all { variant ->
   def name = variant.buildType.name
   if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) {
     return; // Skip debug builds.
   }
   task("javadoc${variant.name.capitalize()}", type: Javadoc) {
-    description "Generates Javadoc for $variant.name."
+    description 'Generates Javadoc for $variant.name.'
     source = variant.javaCompile.source
-    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+    ext.androidJar = '${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar'
     classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
   }
 
   task("bundleJavadoc${variant.name.capitalize()}", type: Jar) {
-    description "Bundles Javadoc into zip for $variant.name."
-    classifier = "javadoc"
+    description 'Bundles Javadoc into zip for $variant.name'
+    classifier = 'javadoc'
     from tasks["javadoc${variant.name.capitalize()}"]
   }
 
 }
 
 task sourcesJar(type: Jar) {
   classifier = 'sources'
-  from android.sourceSets.main.java
+  from android.sourceSets.main.java.srcDirs
 }
 
 task jar(type: Jar) {
-  from 'build/classes/release'
+  from 'build/intermediates/classes/release'
+    exclude '**/BuildConfig.class'
+    exclude '**/R.class'
+    exclude 'de/keyboardsurfer/mobile/'
 }
 
 task javadocJar(type: Jar, dependsOn: "javadocRelease") {
@@ -82,6 +85,7 @@ artifacts {
 
 signing {
   sign configurations.archives
+  sign configurations.compile
 }
 
 uploadArchives {

library/build.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 buildscript {
   repositories {
@@ -33,14 +33,14 @@ repositories {
 dependencies {
   compile project(':crouton-library')
   compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-  compile 'com.android.support:support-v4:19.1.+'
-  compile('com.viewpagerindicator:library:2.4.2-SNAPSHOT') {
+  compile 'com.android.support:support-v4:19.1.0'
+  compile('com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar') {
     exclude group: 'com.google.android', module: 'support-v4'
   }
 }
 
 android {
-  buildToolsVersion '19.1.0'
+  buildToolsVersion '20.0.0'
   compileSdkVersion 19
 
   defaultConfig {