|
16 | 16 | * specific language governing permissions and limitations |
17 | 17 | * under the License. |
18 | 18 | */ |
| 19 | + |
19 | 20 | import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin |
| 21 | +import org.apache.tools.ant.taskdefs.condition.Os |
20 | 22 | import org.elasticsearch.gradle.BuildPlugin |
21 | 23 | import org.elasticsearch.gradle.LoggedExec |
22 | 24 | import org.elasticsearch.gradle.Version |
23 | 25 | import org.elasticsearch.gradle.VersionCollection |
24 | 26 | import org.elasticsearch.gradle.VersionProperties |
25 | 27 | import org.elasticsearch.gradle.plugin.PluginBuildPlugin |
26 | 28 | import org.gradle.plugins.ide.eclipse.model.SourceFolder |
27 | | -import org.gradle.util.GradleVersion |
28 | | -import org.gradle.util.DistributionLocator |
29 | | -import org.apache.tools.ant.taskdefs.condition.Os |
30 | | -import org.apache.tools.ant.filters.ReplaceTokens |
31 | 29 |
|
32 | 30 | import java.nio.file.Files |
33 | 31 | import java.nio.file.Path |
34 | | -import java.security.MessageDigest |
35 | 32 |
|
36 | 33 | plugins { |
37 | 34 | id 'com.gradle.build-scan' version '1.13.2' |
@@ -512,6 +509,16 @@ allprojects { |
512 | 509 | tasks.cleanEclipse.dependsOn(wipeEclipseSettings) |
513 | 510 | // otherwise the eclipse merging is *super confusing* |
514 | 511 | tasks.eclipse.dependsOn(cleanEclipse, copyEclipseSettings) |
| 512 | + |
| 513 | + // work arround https://github.com/gradle/gradle/issues/6582 |
| 514 | + tasks.eclipseProject.mustRunAfter tasks.cleanEclipseProject |
| 515 | + tasks.matching { it.name == 'eclipseClasspath' }.all { |
| 516 | + it.mustRunAfter { tasks.cleanEclipseClasspath } |
| 517 | + } |
| 518 | + tasks.matching { it.name == 'eclipseJdt' }.all { |
| 519 | + it.mustRunAfter { tasks.cleanEclipseJdt } |
| 520 | + } |
| 521 | + tasks.copyEclipseSettings.mustRunAfter tasks.wipeEclipseSettings |
515 | 522 | } |
516 | 523 |
|
517 | 524 | allprojects { |
|
0 commit comments