Merge branch 'release/1.8.5'

.gitignore

@@ -2,9 +2,6 @@
 # Under CC-BY-SA V3.0 (https://creativecommons.org/licenses/by-sa/3.0/legalcode)
 
 # built application files
-*.apk
-*.ap_
-*.jar
 build
 
 # lint files

build.gradle

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-
-
 subprojects {
+version = '1.8.5'
 
   buildscript {
     repositories {
@@ -25,7 +24,7 @@ subprojects {
     }
 
     dependencies {
-      classpath 'com.android.tools.build:gradle:0.8+'
+      classpath 'com.android.tools.build:gradle:0.11.1'
       classpath 'com.github.dcendents:android-maven-plugin:1.0'
     }
   }
@@ -34,5 +33,9 @@ subprojects {
     mavenCentral()
     mavenLocal()
   }
+}
 
+task wrapper(type: Wrapper) {
+  description "Generates the gradle wrapper"
+  gradleVersion = "1.12"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 03 17:16:48 CET 2014
+#Tue Jun 24 02:33:49 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

library/build.gradle

@@ -18,15 +18,15 @@ apply plugin: 'android-maven'
 apply plugin: 'signing'
 
 dependencies {
-  compile 'com.android.support:support-v4:19.0.1'
+  compile 'com.android.support:support-v4:19.1.0'
 }
 
 android {
-  buildToolsVersion '19.0.1'
+  buildToolsVersion '19.1.0'
   compileSdkVersion 19
   defaultConfig {
     versionCode 7
-    versionName "1.8.4"
+    versionName = project.version
     minSdkVersion 8
     targetSdkVersion 19
   }
@@ -39,17 +39,16 @@ android {
 
 group = "de.keyboardsurfer.android.widget"
 artifactId = "crouton"
-version = "1.8.4"
 
 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.
   }
   task("javadoc${variant.name.capitalize()}", type: Javadoc) {
     description "Generates Javadoc for $variant.name."
     source = variant.javaCompile.source
-    ext.androidJar = "${android.plugin.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
     classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
   }
 
@@ -81,13 +80,6 @@ artifacts {
   archives jar
 }
 
-
-task wrapper(type: Wrapper) {
-  description "Generates the gradle wrapper"
-  gradleVersion = "1.10"
-}
-
-
 signing {
   sign configurations.archives
 }