Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.ProjectDependency;
import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency;
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -52,13 +52,15 @@ protected InputStream resolveManifest(DependencySource autodocManifest) {

@Override
protected Optional<DependencySource> createSource(Dependency dependency) {
if (dependency instanceof DefaultProjectDependency localDependency) {
var manifestFile = localDependency.getDependencyProject().getLayout().getBuildDirectory().file("edc.json");
if (manifestFile.isPresent()) {
return Optional.of(DependencySourceFactory.createDependencySource(manifestFile.get().getAsFile().toURI(), dependency, MANIFEST_CLASSIFIER, MANIFEST_TYPE));
if (dependency instanceof ProjectDependencyInternal localDependency) {
var buildPath = localDependency.getTargetProjectIdentity().getBuildPath();
var manifestFile = new File(buildPath.relativePath("edc.json"));
if (manifestFile.exists()) {
return Optional.of(DependencySourceFactory.createDependencySource(manifestFile.toURI(), dependency, MANIFEST_CLASSIFIER, MANIFEST_TYPE));
} else {
getLogger().debug("No manifest file found for dependency {}", dependency);
}
return Optional.empty();

} else {
getLogger().debug("Dependency {} is not a DefaultProjectDependency", dependency);
Expand Down
Loading