diff --git a/gradle/android-tasks.gradle b/gradle/android-tasks.gradle
index b614ed95e..7c2de364a 100644
--- a/gradle/android-tasks.gradle
+++ b/gradle/android-tasks.gradle
@@ -33,24 +33,24 @@ afterEvaluate { project ->
         }
 
         task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-            classifier = 'javadoc'
+            archiveClassifier.set('javadoc')
             from androidJavadoc.destinationDir
         }
 
         task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
+            archiveClassifier.set('sources')
             from android.sourceSets.main.java.srcDirs
         }
 
         android.libraryVariants.all { variant ->
             def name = variant.name.capitalize()
-            task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
-                from variant.javaCompile.destinationDir
+            task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider) {
+                from variant.javaCompileProvider.get().destinationDir
             }
 
             androidJavadoc.doFirst {
                 classpath += files(android.bootClasspath)
-                classpath += files(variant.javaCompile.classpath.files)
+                classpath += files(variant.javaCompileProvider.get().classpath.files)
                 // This is generated by `assembleDebug` and holds the JARs generated by the APT.
                 classpath += fileTree(dir: "$buildDir/intermediates/bundles/debug/", include: '**/*.jar')
 
@@ -76,12 +76,12 @@ afterEvaluate { project ->
 
     if (POM_PACKAGING == 'jar') {
         task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
+            archiveClassifier.set('javadoc')
             from javadoc.destinationDir
         }
 
         task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
+            archiveClassifier.set('sources')
             from sourceSets.main.allSource
         }