From cdae9203a94c1a7bcb0f89681c0a5c331025cd90 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 29 Nov 2024 11:27:44 +0100 Subject: [PATCH] Cleanup OciImageDependenciesImpl --- .../gradle/oci/internal/dsl/OciImageDependenciesImpl.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt index 85d779ff..6085c948 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt @@ -84,7 +84,6 @@ internal abstract class OciImageDependenciesImpl @Inject constructor( } private val indexGraph = lazy { resolveOciVariantGraph(indexConfiguration.incoming) } - private val allDependencies = lazy { indexConfiguration.allDependencies.filterIsInstance() } final override fun resolve(platformSelectorProvider: Provider): Provider> { val lazy = lazy { @@ -93,7 +92,7 @@ internal abstract class OciImageDependenciesImpl @Inject constructor( val selectedPlatformsGraph: OciVariantGraphWithSelectedPlatforms? val platformConfigurationPairs: List> if (singlePlatform == null) { - val allDependencies = allDependencies.value + val allDependencies = indexConfiguration.allDependencies.filterIsInstance() selectedPlatformsGraph = indexGraph.value.selectPlatforms(platformSelector) platformConfigurationPairs = selectedPlatformsGraph.groupByPlatform().map { (platform, graph) -> val platformSelectorString = platformSelector?.toString() ?: "all supported"