From 551bb8e5ddfd9f87eeff488cb717f287c698cc7a Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Tue, 9 Jul 2024 23:51:28 +0200 Subject: [PATCH] Move OciImageSpecResolution, ArtifactViewComponentFilter, PlatformSet to internal.resolution package --- .../oci/internal/dsl/ResolvableOciImageDependenciesImpl.kt | 4 ++-- .../resolution}/ArtifactViewComponentFilter.kt | 2 +- .../resolution}/OciImageSpecResolution.kt | 2 +- .../oci/{component => internal/resolution}/PlatformSet.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/main/kotlin/io/github/sgtsilvio/gradle/oci/{component => internal/resolution}/ArtifactViewComponentFilter.kt (97%) rename src/main/kotlin/io/github/sgtsilvio/gradle/oci/{component => internal/resolution}/OciImageSpecResolution.kt (99%) rename src/main/kotlin/io/github/sgtsilvio/gradle/oci/{component => internal/resolution}/PlatformSet.kt (95%) diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/ResolvableOciImageDependenciesImpl.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/ResolvableOciImageDependenciesImpl.kt index 8eb73f43..ed9220d9 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/ResolvableOciImageDependenciesImpl.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/ResolvableOciImageDependenciesImpl.kt @@ -5,13 +5,13 @@ import io.github.sgtsilvio.gradle.oci.OciImageReferenceSpec import io.github.sgtsilvio.gradle.oci.OciImagesInput import io.github.sgtsilvio.gradle.oci.OciVariantInput import io.github.sgtsilvio.gradle.oci.attributes.* -import io.github.sgtsilvio.gradle.oci.component.ArtifactViewComponentFilter -import io.github.sgtsilvio.gradle.oci.component.resolveOciImageSpecs import io.github.sgtsilvio.gradle.oci.dsl.ResolvableOciImageDependencies import io.github.sgtsilvio.gradle.oci.dsl.ResolvableOciImageDependencies.Nameable import io.github.sgtsilvio.gradle.oci.dsl.ResolvableOciImageDependencies.Taggable import io.github.sgtsilvio.gradle.oci.internal.gradle.attribute import io.github.sgtsilvio.gradle.oci.internal.gradle.zipAbsentAsNull +import io.github.sgtsilvio.gradle.oci.internal.resolution.ArtifactViewComponentFilter +import io.github.sgtsilvio.gradle.oci.internal.resolution.resolveOciImageSpecs import org.gradle.api.artifacts.ConfigurationContainer import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.component.ComponentIdentifier diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/ArtifactViewComponentFilter.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/ArtifactViewComponentFilter.kt similarity index 97% rename from src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/ArtifactViewComponentFilter.kt rename to src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/ArtifactViewComponentFilter.kt index e5be3ed4..72dd3357 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/ArtifactViewComponentFilter.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/ArtifactViewComponentFilter.kt @@ -1,4 +1,4 @@ -package io.github.sgtsilvio.gradle.oci.component +package io.github.sgtsilvio.gradle.oci.internal.resolution import org.gradle.api.artifacts.component.ComponentIdentifier import org.gradle.api.artifacts.result.ResolvedComponentResult diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/OciImageSpecResolution.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageSpecResolution.kt similarity index 99% rename from src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/OciImageSpecResolution.kt rename to src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageSpecResolution.kt index 2e50dd4a..41993d84 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/OciImageSpecResolution.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageSpecResolution.kt @@ -1,4 +1,4 @@ -package io.github.sgtsilvio.gradle.oci.component +package io.github.sgtsilvio.gradle.oci.internal.resolution import io.github.sgtsilvio.gradle.oci.DEFAULT_OCI_REFERENCE_SPEC import io.github.sgtsilvio.gradle.oci.OciImageReferenceSpec diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/PlatformSet.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/PlatformSet.kt similarity index 95% rename from src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/PlatformSet.kt rename to src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/PlatformSet.kt index 57186a1b..7a1d661f 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/component/PlatformSet.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/PlatformSet.kt @@ -1,4 +1,4 @@ -package io.github.sgtsilvio.gradle.oci.component +package io.github.sgtsilvio.gradle.oci.internal.resolution import io.github.sgtsilvio.gradle.oci.platform.Platform