Update to Gradle v2.1 and Android plugin v0.13

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         classpath 'org.robolectric:robolectric-gradle-plugin:0.12.+'
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.13.+'
     }
 }
 
@@ -53,5 +53,5 @@ subprojects { project ->
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.1'
 }

glide/build.gradle

@@ -48,13 +48,10 @@ def getAndroidJar() {
 ['release', 'debug'].each { variantName ->
 
     task("${variantName}SourceJar", type: Jar) {
-      classifier = 'sources'
       from getSourceFilesForVariant(variantName)
     }
 
     def javadocTask = task("${variantName}Javadoc", type: Javadoc) {
-        classifier = 'javadoc'
-
         source = getSourceFilesForVariant(variantName)
 
         classpath = files(getAndroidLibraryVariants(variantName).collect {
@@ -77,7 +74,6 @@ def getAndroidJar() {
     clean.dependsOn(cleanJavadocTask)
 
     def javadocJarTask = task("${variantName}JavadocJar", type: Jar) {
-      classifier = 'javadoc'
       from javadocTask.destinationDir
     }
     javadocJarTask.dependsOn(javadocTask)
@@ -99,8 +95,12 @@ getAllInternalProjects().each { project ->
 }
 
 artifacts {
-    archives releaseJavadocJar
-    archives releaseSourceJar
+    archives releaseJavadocJar {
+        classifier 'javadoc'
+    }
+    archives releaseSourceJar {
+        classifier 'sources'
+    }
 }
 
 apply from: "$rootProject.projectDir/scripts/upload.gradle"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jun 28 20:49:51 PDT 2014
+#Fri Sep 19 07:33:32 PDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

scripts/upload.gradle

@@ -114,8 +114,6 @@ afterEvaluate { project ->
         def androidSdkDirectory = project.android.sdkDirectory
 
         task androidJavadocs(type: Javadoc, dependsOn: compileReleaseJava) {
-            classifier = 'javadoc'
-
             source = releaseVariants.collect { it.javaCompile.source }
             classpath = files(releaseVariants.collect { files(it.javaCompile.classpath.files,
                     project.android.bootClasspath) })
@@ -130,20 +128,22 @@ afterEvaluate { project ->
         }
 
         task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-            classifier = 'javadoc'
             from androidJavadocs.destinationDir
         }
 
         task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
             from project.android.sourceSets.main.java.source
         }
     }
 
     artifacts {
         if (project.getPlugins().hasPlugin('android') || project.getPlugins().hasPlugin('android-library')) {
-            archives androidSourcesJar
-            archives androidJavadocsJar
+            archives androidSourcesJar {
+                classifier "sources"
+            }
+            archives androidJavadocsJar {
+                classifier "javadoc"
+            }
         }
     }
 }