Commit e28a9216 authored by Max Lv's avatar Max Lv

Remove deprecated variant.javaCompiler tasks

parent b3ee21d7
...@@ -106,15 +106,13 @@ afterEvaluate { project -> ...@@ -106,15 +106,13 @@ afterEvaluate { project ->
android.libraryVariants.all { variant -> android.libraryVariants.all { variant ->
def javadocTask = task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { def javadocTask = task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
description "Generates Javadoc for $variant.name." description "Generates Javadoc for $variant.name."
source = variant.javaCompiler.source source = android.sourceSets.main.java.srcDirs
ext.androidJar = project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
classpath = files(variant.javaCompiler.classpath.files) + files(ext.androidJar) exclude '**/*.kt'
exclude '**/BuildConfig.java' exclude '**/BuildConfig.java'
exclude '**/R.java' exclude '**/R.java'
} }
javadocTask.dependsOn variant.javaCompiler
def jarJavadocTask = task("jar${variant.name.capitalize()}Javadoc", type: Jar) { def jarJavadocTask = task("jar${variant.name.capitalize()}Javadoc", type: Jar) {
description "Generate Javadoc Jar for $variant.name" description "Generate Javadoc Jar for $variant.name"
classifier = 'javadoc' classifier = 'javadoc'
...@@ -127,10 +125,9 @@ afterEvaluate { project -> ...@@ -127,10 +125,9 @@ afterEvaluate { project ->
def jarSourceTask = task("jar${variant.name.capitalize()}Sources", type: Jar) { def jarSourceTask = task("jar${variant.name.capitalize()}Sources", type: Jar) {
description "Generates Java Sources for $variant.name." description "Generates Java Sources for $variant.name."
classifier = 'sources' classifier = 'sources'
from variant.javaCompiler.source from android.sourceSets.main.java.srcDirs
} }
jarSourceTask.dependsOn variant.javaCompiler
artifacts.add('archives', jarSourceTask) artifacts.add('archives', jarSourceTask)
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment