Skip to content

Commit 0aa67fa

Browse files
authored
build(deps): bump gradlew to 9.0 (#368)
1 parent f1a5ef4 commit 0aa67fa

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/ResolveManifestTask.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import org.gradle.api.artifacts.Dependency;
1818
import org.gradle.api.artifacts.ProjectDependency;
19-
import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency;
19+
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
2020

2121
import java.io.File;
2222
import java.io.FileInputStream;
@@ -52,13 +52,15 @@ protected InputStream resolveManifest(DependencySource autodocManifest) {
5252

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

6365
} else {
6466
getLogger().debug("Dependency {} is not a DefaultProjectDependency", dependency);

0 commit comments

Comments
 (0)