Skip to content

Commit 099865d

Browse files
authored
Compat deprecated getDependencyProject usage (#1106)
1 parent 95277bb commit 099865d

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.github.jengelman.gradle.plugins.shadow.internal
22

33
import org.gradle.api.Project
44
import org.gradle.api.artifacts.Configuration
5+
import org.gradle.api.artifacts.ProjectDependency
56
import org.gradle.api.file.ConfigurableFileCollection
67
import org.gradle.api.model.ObjectFactory
78
import org.gradle.api.plugins.JavaPlugin
@@ -34,3 +35,15 @@ internal fun ConfigurableFileCollection.conventionCompat(vararg paths: Any): Con
3435
this
3536
}
3637
}
38+
39+
/**
40+
* TODO: this could be removed after bumping the min Gradle requirement to 8.11 or above.
41+
*/
42+
internal fun ProjectDependency.dependencyProjectCompat(project: Project): Project {
43+
return if (GradleVersion.current() >= GradleVersion.version("8.11")) {
44+
project.project(path)
45+
} else {
46+
@Suppress("DEPRECATION")
47+
dependencyProject
48+
}
49+
}

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/UnusedTracker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal class UnusedTracker private constructor(
5656
apiDependencies.forEach { dep ->
5757
when (dep) {
5858
is ProjectDependency -> {
59-
apiJars.addAll(getApiJarsFromProject(dep.dependencyProject))
59+
apiJars.addAll(getApiJarsFromProject(dep.dependencyProjectCompat(project)))
6060
addJar(runtimeConfiguration, dep, apiJars)
6161
}
6262
is SelfResolvingDependency -> {

0 commit comments

Comments
 (0)