Skip to content

Commit 8b09b36

Browse files
committed
Fix using the deprecated dependencyProject property
1 parent cc2c2b1 commit 8b09b36

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

libs/gretty/src/main/groovy/org/akhikhl/gretty/ProjectUtils.groovy

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.gradle.api.Project
1515
import org.gradle.api.artifacts.Configuration
1616
import org.gradle.api.artifacts.ProjectDependency
1717
import org.gradle.api.file.FileCollection
18+
import org.gradle.util.GradleVersion
1819
import org.slf4j.Logger
1920
import org.slf4j.LoggerFactory
2021
/**
@@ -149,7 +150,7 @@ final class ProjectUtils {
149150
if (!dependencyConfig) return
150151
projectClosure(project)
151152
dependencyConfig.allDependencies.withType(ProjectDependency).each {
152-
walkProjectDependencies(it.dependencyProject, dependencyConfigName, projectClosure)
153+
walkProjectDependencies(getDependencyProject(project, it), dependencyConfigName, projectClosure)
153154
}
154155
}
155156

@@ -497,7 +498,13 @@ final class ProjectUtils {
497498
}
498499

499500
static List<Project> getDependencyProjects(Project project, String configurationName) {
500-
project.configurations[configurationName].dependencies.withType(ProjectDependency).collect{ it.dependencyProject }
501+
project.configurations[configurationName].dependencies.withType(ProjectDependency).collect { getDependencyProject(project, it) }
502+
}
503+
504+
static Project getDependencyProject(Project project, ProjectDependency dependency) {
505+
GradleVersion.current().baseVersion.version.startsWith('7.') ?
506+
dependency.dependencyProject :
507+
project.project(dependency.path)
501508
}
502509

503510
/**

0 commit comments

Comments
 (0)