Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid android private API: variant.variantData #235

Merged
merged 4 commits into from
Jun 5, 2018
Merged

Avoid android private API: variant.variantData #235

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fecb74
Avoid android private API: variant.variantData
zpencer Jun 4, 2018
653bbac
remove unneeded parens
zpencer Jun 4, 2018
b50886b
codenarc
zpencer Jun 4, 2018
df9826e
fix code narc for real
zpencer Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 13 additions & 36 deletions src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,11 @@ class ProtobufPlugin implements Plugin<Project> {
*/
private addProtoTasks() {
if (Utils.isAndroidProject(project)) {
(getNonTestVariants() + project.android.testVariants + project.android.unitTestVariants).each { variant ->
addTasksForVariant(variant)
getNonTestVariants().each { variant ->
addTasksForVariant(variant, false)
}
(project.android.unitTestVariants + project.android.testVariants).each { variant ->
addTasksForVariant(variant, true)
}
} else {
getSourceSets().each { sourceSet ->
Expand Down Expand Up @@ -232,43 +235,17 @@ class ProtobufPlugin implements Plugin<Project> {
/**
* Creates Protobuf tasks for a variant in an Android project.
*/
private addTasksForVariant(final Object variant) {
// The collection of sourceSets that will be compiled for this variant
List sourceSetNames = []
List sourceSets = []
boolean isTestVariant = ['ANDROID_TEST', "UNIT_TEST"].contains(variant.variantData.type.toString())
if (!isTestVariant) {
// All non-test variants will include the main sourceSet
sourceSetNames.add 'main'
}
// see: https://android.googlesource.com/platform/tools/build/+/master/builder/src/main/java/
// com/android/builder/VariantConfiguration.java
sourceSetNames.add variant.variantData.variantConfiguration.defaultSourceSet.name // e.g. main, androidTest, test
sourceSetNames.add variant.name // e.g. x86FreeappDebug
if (variant.hasProperty('buildType')) {
sourceSetNames.add variant.buildType.name
}
ImmutableList.Builder<String> flavorListBuilder = ImmutableList.builder()
if (variant.hasProperty('productFlavors')) {
variant.productFlavors.each { flavor ->
sourceSetNames.add flavor.name
flavorListBuilder.add flavor.name
}
}
sourceSetNames.each { sourceSetName ->
sourceSets.add project.android.sourceSets.maybeCreate(sourceSetName)
}

Task generateProtoTask = addGenerateProtoTask(variant.name, sourceSets)
private addTasksForVariant(final Object variant, boolean isTestVariant) {
Task generateProtoTask = addGenerateProtoTask(variant.name, variant.sourceSets)
generateProtoTask.setVariant(variant, isTestVariant)
generateProtoTask.flavors = flavorListBuilder.build()
generateProtoTask.flavors = ImmutableList.copyOf(variant.productFlavors.collect { it.name } )
if (variant.hasProperty('buildType')) {
generateProtoTask.buildType = variant.buildType.name
}
generateProtoTask.doneInitializing()

sourceSetNames.each { sourceSetName ->
Task extractProtosTask = maybeAddExtractProtosTask(sourceSetName)
variant.sourceSets.each {
Task extractProtosTask = maybeAddExtractProtosTask(it.name)
generateProtoTask.dependsOn(extractProtosTask)
}

Expand All @@ -293,9 +270,9 @@ class ProtobufPlugin implements Plugin<Project> {
generateProtoTask.dependsOn(extractIncludeProtosTask)
} else {
// For Android Gradle plugin < 2.5
sourceSetNames.each { sourceSetName ->
variant.sourceSets.each {
Task extractIncludeProtosTask =
maybeAddExtractIncludeProtosTask(sourceSetName)
maybeAddExtractIncludeProtosTask(it.name)
generateProtoTask.dependsOn(extractIncludeProtosTask)
}
}
Expand Down Expand Up @@ -456,7 +433,7 @@ class ProtobufPlugin implements Plugin<Project> {
project.android.unitTestVariants.each { variant ->
project.protobuf.generateProtoTasks.ofVariant(variant.name).each { GenerateProtoTask genProtoTask ->
// unit test variants do not implement registerJavaGeneratingTask
Task javaCompileTask = variant.variantData.javaCompilerTask
Task javaCompileTask = variant.javaCompile
if (javaCompileTask != null) {
linkGenerateProtoTasksToTask(javaCompileTask, genProtoTask)
}
Expand Down