Skip to content

Commit 615fedd

Browse files
committed
Some cleanup and verification
1 parent 2db467e commit 615fedd

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.gradle.internal;
1111

1212
import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
13-
import org.elasticsearch.gradle.internal.precommit.DependencyLicensesTask;
1413
import org.gradle.api.Plugin;
1514
import org.gradle.api.Project;
1615
import org.gradle.api.artifacts.Configuration;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ public abstract class DependenciesInfoTask extends ConventionTask {
6060
@Inject
6161
public abstract ProviderFactory getProviderFactory();
6262

63+
/**
64+
* We have to use ArtifactCollection instead of ResolvedArtifactResult here as we're running
65+
* into a an issue in Gradle: https://github.com/gradle/gradle/issues/27582
66+
*/
67+
6368
@Internal
6469
abstract Property<ArtifactCollection> getRuntimeArtifacts();
6570

@@ -76,6 +81,11 @@ public Provider<Set<ModuleComponentIdentifier>> getCompileOnlyModules() {
7681
return mapToModuleComponentIdentifiers(getCompileOnlyArtifacts().get());
7782
}
7883

84+
/**
85+
* We need to track file inputs here from the configurations we inspect to ensure we dont miss any
86+
* artifact transforms that might be applied and fail due to missing task dependency to jar
87+
* generating tasks.
88+
* */
7989
@InputFiles
8090
abstract ConfigurableFileCollection getClasspath();
8191

0 commit comments

Comments
 (0)