From 5c50b16701674b642993a60806b3d046b1f845d9 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Tue, 30 Apr 2019 13:08:54 -0700 Subject: [PATCH] Remove deprecated gradle calls Summary: Mirroring https://github.com/facebook/litho/commit/897fe6123e8bab797cddf9ec1d93efd3630eb32b#diff-aa51f8b3cd4c236a2fa014f530b3b780 Reviewed By: jknoxville Differential Revision: D15146913 fbshipit-source-id: 0eca84e9d0c536ac78883b11dccb3243786ab130 --- gradle/android-tasks.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 }