jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated gradle calls

Browse Source 
Summary: Mirroring 897fe6123e (diff-aa51f8b3cd4c236a2fa014f530b3b780)

Reviewed By: jknoxville

Differential Revision: D15146913

fbshipit-source-id: 0eca84e9d0c536ac78883b11dccb3243786ab130
This commit is contained in:
Pascal Hartig
2019-04-30 13:08:54 -07:00
committed by Facebook Github Bot
parent db5d486c6f
commit 5c50b16701
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gradle/android-tasks.gradle
View File

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