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
9 changes: 5 additions & 4 deletions src/main/java/org/javamodularity/moduleplugin/TestEngine.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.javamodularity.moduleplugin;

import org.gradle.api.GradleException;
import org.gradle.api.Project;
import org.gradle.api.artifacts.*;
import org.gradle.api.logging.Logger;
Expand Down Expand Up @@ -115,17 +116,17 @@ private static Stream<GroupArtifact> getModuleIdentifiers(Configuration origCfg,
return getDirectDependencies(origCfg);
}

Configuration cfg = origCfg.copyRecursive();
cfg.setCanBeResolved(true);
try {
Configuration cfg = origCfg.copyRecursive();
cfg.setCanBeResolved(true);
cfg.resolve();
Set<ResolvedDependency> flmDeps = cfg.getResolvedConfiguration().getFirstLevelModuleDependencies();
return flmDeps.stream()
.flatMap(dep -> Stream.concat(getAllDeps(dep).stream(),Stream.of(dep)))
.filter(dep -> isDependencyPresent(dep, files))
.map(dep -> GroupArtifact.fromModuleIdentifier(dep.getModule().getId().getModule()));
} catch (ResolveException e) {
LOGGER.debug("Cannot resolve transitive dependencies of configuration " + cfg.getName(), e);
} catch (GradleException e) {
LOGGER.debug("Cannot resolve transitive dependencies of configuration " + origCfg.getName(), e);
return getDirectDependencies(origCfg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion test-project-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "2.0.0" apply false
kotlin("jvm") version "2.3.21" apply false
id("org.javamodularity.moduleplugin") version "2.0.0" apply false
}

Expand Down