mirror of https://github.com/grpc/grpc-java.git
Only delete the generated code being regenerated
This fixes the problem where protobuf-nano's test generated code was trashed any time a target that depended on protobuf-nano was compiled.
This commit is contained in:
parent
7fe8d8bb20
commit
e9b4d151de
|
|
@ -80,7 +80,7 @@ subprojects {
|
||||||
all().each { task ->
|
all().each { task ->
|
||||||
task.dependsOn ':grpc-compiler:java_pluginExecutable'
|
task.dependsOn ':grpc-compiler:java_pluginExecutable'
|
||||||
// Delete the generated sources first, so that we can be alerted if they are not re-compiled.
|
// Delete the generated sources first, so that we can be alerted if they are not re-compiled.
|
||||||
task.dependsOn deleteGeneratedSource
|
task.dependsOn 'deleteGeneratedSource' + task.sourceSet.name
|
||||||
// Recompile protos when the codegen has been changed
|
// Recompile protos when the codegen has been changed
|
||||||
task.inputs.file javaPluginPath
|
task.inputs.file javaPluginPath
|
||||||
// Recompile protos when build.gradle has been changed, because
|
// Recompile protos when build.gradle has been changed, because
|
||||||
|
|
@ -94,8 +94,10 @@ subprojects {
|
||||||
generatedFilesBaseDir = generatedSourcePath
|
generatedFilesBaseDir = generatedSourcePath
|
||||||
}
|
}
|
||||||
|
|
||||||
task deleteGeneratedSource << {
|
sourceSets.each { sourceSet ->
|
||||||
project.delete project.fileTree(dir: generatedSourcePath)
|
task "deleteGeneratedSource${sourceSet.name}" << {
|
||||||
|
project.delete project.fileTree(dir: generatedSourcePath + '/' + sourceSet.name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, we just use the checked-in generated code.
|
// Otherwise, we just use the checked-in generated code.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue