Merge pull request #156 from austinarbor/fix-rc

Gradle 8.11 Fix
austinarbor · Oct 21, 2024 · 42dbc42 · 42dbc42
2 parents d84b393 + 428cb0a
commit 42dbc42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/plugin/src/main/kotlin/dev/aga/gradle/versioncatalogs/service/PublishedArtifactResolver.kt b/plugin/src/main/kotlin/dev/aga/gradle/versioncatalogs/service/PublishedArtifactResolver.kt
@@ -2,7 +2,6 @@ package dev.aga.gradle.versioncatalogs.service
 
 import dev.aga.gradle.versioncatalogs.exception.ResolutionException
 import java.io.File
-import java.util.concurrent.atomic.AtomicInteger
 import java.util.function.Supplier
 import org.apache.maven.model.Dependency
 import org.gradle.api.artifacts.Configuration
@@ -44,13 +43,7 @@ class PublishedArtifactResolver(
     }
 
     private fun createConfiguration(): Configuration {
-        val config =
-            drs.configurationContainer.create(
-                "incomingConfiguration${configurationCount.incrementAndGet()}",
-            )
-
-        return config.apply {
-            resolutionStrategy.activateDependencyLocking()
+        return drs.configurationContainer.detachedConfiguration().apply {
             attributes {
                 attribute(
                     Category.CATEGORY_ATTRIBUTE,
@@ -61,8 +54,4 @@ class PublishedArtifactResolver(
             isCanBeConsumed = false
         }
     }
-
-    companion object {
-        private val configurationCount = AtomicInteger(0)
-    }
 }
diff --git a/...in/src/test/kotlin/dev/aga/gradle/versioncatalogs/service/MockGradleDependencyResolver.kt b/...in/src/test/kotlin/dev/aga/gradle/versioncatalogs/service/MockGradleDependencyResolver.kt
@@ -34,7 +34,7 @@ class MockGradleDependencyResolver(val rootDir: Path) : DependencyResolver {
         }
 
     private val configurationContainer =
-        mock<ConfigurationContainer> { on { create(any<String>()) } doReturn configuration }
+        mock<ConfigurationContainer> { on { detachedConfiguration() } doReturn configuration }
 
     private val drs =
         mock<DependencyResolutionServices> {