chore: use non-deprecated method when available.

autonomousapps · Jan 9, 2025 · 309cd95 · 309cd95
1 parent c9b15ef
commit 309cd95
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/main/kotlin/com/autonomousapps/internal/GradleVersions.kt b/src/main/kotlin/com/autonomousapps/internal/GradleVersions.kt
@@ -12,6 +12,7 @@ internal object GradleVersions {
   private val gradle83: GradleVersion = GradleVersion.version("8.3")
   private val gradle85: GradleVersion = GradleVersion.version("8.5")
   private val gradle88: GradleVersion = GradleVersion.version("8.8")
+  private val gradle811: GradleVersion = GradleVersion.version("8.11")
 
   /** Minimum supported version of Gradle. */
   @JvmField val minGradleVersion: GradleVersion = gradle74
@@ -24,6 +25,9 @@ internal object GradleVersions {
   val isAtLeastGradle83: Boolean = current >= gradle83
   val isAtLeastGradle85: Boolean = current >= gradle85
 
+  /** Minimum version of Gradle for [org.gradle.api.artifacts.ProjectDependency.getPath] */
+  val isAtLeastGradle811: Boolean = current >= gradle811
+
   /**
    * Minimum version of Gradle for [BuildHealthPlugin][com.autonomousapps.BuildHealthPlugin], because it uses the new
    * lifecycle callbacks.

diff --git a/src/main/kotlin/com/autonomousapps/internal/utils/gradleStrings.kt b/src/main/kotlin/com/autonomousapps/internal/utils/gradleStrings.kt
@@ -200,7 +200,12 @@ internal fun Dependency.toCoordinates(): Coordinates? {
  */
 internal fun Dependency.toIdentifier(): Pair<ModuleInfo, GradleVariantIdentification>? = when (this) {
   is ProjectDependency -> {
-    val identifier = dependencyProject.path
+    val identifier = if (GradleVersions.isAtLeastGradle811) {
+      path
+    } else {
+      @Suppress("DEPRECATION")
+      dependencyProject.path
+    }
     Pair(ModuleInfo(identifier.intern()), targetGradleVariantIdentification())
   }
 

diff --git a/...gradle-testkit-plugin/src/main/kotlin/com/autonomousapps/GradleTestKitSupportExtension.kt b/...gradle-testkit-plugin/src/main/kotlin/com/autonomousapps/GradleTestKitSupportExtension.kt
@@ -12,6 +12,7 @@ import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.Test
+import org.gradle.util.GradleVersion
 import java.io.File
 
 /**
@@ -208,8 +209,17 @@ public abstract class GradleTestKitSupportExtension(private val project: Project
     return configurations.findByName(classpath)?.allDependencies
       ?.filterIsInstance<ProjectDependency>()
       // filter out self-dependency
-      ?.filterNot { it.dependencyProject == project }
-      ?.map { "${it.dependencyProject.path}:$taskName" }
+      ?.filterNot { projectPath(it) == project.path }
+      ?.map { "${projectPath(it)}:$taskName" }
+  }
+
+  private val isAtLeastGradle811 = GradleVersion.current() >= GradleVersion.version("8.11")
+
+  private fun projectPath(projectDependency: ProjectDependency): String = if (isAtLeastGradle811) {
+    projectDependency.path
+  } else {
+    @Suppress("DEPRECATION")
+    projectDependency.dependencyProject.path
   }
 
   /**