Cleanup OciImageInput/SpecResolution.kt

SgtSilvio · Jul 18, 2024 · 1c3ca74 · 1c3ca74
1 parent d0481f2
commit 1c3ca74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageInputResolution.kt b/...main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageInputResolution.kt
@@ -16,9 +16,7 @@ internal fun ResolvableDependencies.resolveOciImageInputs(
 ): Provider<List<OciImagesTask.ImageInput>> {
     val rootComponentResultProvider = resolutionResult.rootComponent
     val imageSpecsProvider =
-        rootComponentResultProvider.zipAbsentAsNull(platformSelectorProvider) { rootComponentResult, platformSelector ->
-            resolveOciImageSpecs(rootComponentResult, platformSelector)
-        }
+        rootComponentResultProvider.zipAbsentAsNull(platformSelectorProvider, ::resolveOciImageSpecs)
     val artifactResultsProvider = artifactView {
         componentFilter(
             ArtifactViewVariantFilter(

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageSpecResolution.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageSpecResolution.kt
@@ -25,7 +25,7 @@ internal fun resolveOciImageSpecs(
     platformSelector: PlatformSelector?,
 ): List<OciImageSpec> {
     val rootNodesToReferenceSpecs = resolveOciVariantGraph(rootComponentResult)
-    return resolveOciImageSpecs(rootNodesToReferenceSpecs, platformSelector)
+    return collectOciImageSpecs(rootNodesToReferenceSpecs, platformSelector)
 }
 
 private fun resolveOciVariantGraph(
@@ -134,7 +134,7 @@ private val ResolvedVariantResult.platformOrUniversalOrMulti: String
         return capabilities.first().name.substringAfterLast('@')
     }
 
-private fun resolveOciImageSpecs(
+private fun collectOciImageSpecs(
     rootNodesToReferenceSpecs: Map<OciVariantNode, Set<OciImageReferenceSpec>>,
     platformSelector: PlatformSelector?,
 ): List<OciImageSpec> {