Restructure ImageExtractor for better import in blocking context

CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [v1.5.1] - 2026-04-01
+
+### Fixed
+
+- Transitive dependencies now properly include sub-projects
+
+## [v1.5.0] - 2026-03-26
 
 ### Fixed
 

kirc-blocking/build.gradle.kts

@@ -3,6 +3,8 @@ plugins {
     kotlin("libs.publisher")
 }
 
+group = "com.github.cmdjulian.kirc"
+
 dependencies {
     api(project(":kirc-core"))
     api(project(":kirc-image"))

kirc-blocking/src/main/kotlin/de/cmdjulian/kirc/tar/BlockingImageExtractor.kt

@@ -0,0 +1,14 @@
+package de.cmdjulian.kirc.tar
+
+import kotlinx.coroutines.runBlocking
+import java.nio.file.Path
+
+object BlockingImageExtractor {
+    /**
+     * Parses docker container image from [path] representing a tar file into an object Representation
+     *
+     * If [isGzipped] is true, the file will be treated as gzipped tar and decompressed before parsing
+     */
+    fun parse(path: Path, isGzipped: Boolean = false): ContainerImageMetadata =
+        runBlocking { ImageExtractor.parse(path, isGzipped) }
+}

kirc-core/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     kotlin("kapt")
 }
 
+group = "com.github.cmdjulian.kirc"
+
 dependencies {
     implementation(project(":kirc-image"))
 

kirc-core/src/main/kotlin/de/cmdjulian/kirc/tar/ContainerImageMetadata.kt

@@ -0,0 +1,40 @@
+package de.cmdjulian.kirc.tar
+
+import de.cmdjulian.kirc.image.Digest
+import de.cmdjulian.kirc.spec.Platform
+import de.cmdjulian.kirc.spec.image.ImageConfig
+import de.cmdjulian.kirc.spec.manifest.LayerReference
+import de.cmdjulian.kirc.spec.manifest.ManifestList
+import de.cmdjulian.kirc.spec.manifest.ManifestSingle
+
+/**
+ * Represents the metadata of an image tar archive without spilled blobs.
+ *
+ * @param index content of index.json
+ * @param images collected manifests specified in index with their metadata
+ */
+data class ContainerImageMetadata(val index: ManifestList, val images: List<ContainerImageSingleMetadata>) {
+    val imageForCurrentPlatform: ContainerImageSingleMetadata?
+        get() = images.firstOrNull { image ->
+            Platform(image.config.os, image.config.architecture) == Platform.current()
+        }
+}
+
+/**
+ * Represents a single platform image's metadata — no blob paths, just descriptors and deserialized config.
+ *
+ * @param manifest manifest of platform image
+ * @param digest digest of platform image manifest
+ * @param layers layer descriptors from the manifest (mediaType, size, digest)
+ * @param config deserialized image config
+ * @param tags human-readable tags for this image (e.g. "ubuntu:22.04"); empty if untagged.
+ *             Resolved from Docker-format manifest.json repoTags and OCI index annotations
+ *             (org.opencontainers.image.ref.name).
+ */
+data class ContainerImageSingleMetadata(
+    val manifest: ManifestSingle,
+    val digest: Digest,
+    val layers: List<LayerReference>,
+    val config: ImageConfig,
+    val tags: List<String>,
+)

kirc-image/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     kotlin("kapt")
 }
 
+group = "com.github.cmdjulian.kirc"
+
 tasks.jar {
     manifest {
         attributes(mapOf("Implementation-Title" to project.name, "Implementation-Version" to project.version))

kirc-reactive/build.gradle.kts

@@ -3,6 +3,8 @@ plugins {
     kotlin("libs.publisher")
 }
 
+group = "com.github.cmdjulian.kirc"
+
 dependencies {
     api(project(":kirc-core"))
     api(project(":kirc-image"))

kirc-suspending/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     kotlin("kapt")
 }
 
+group = "com.github.cmdjulian.kirc"
+
 dependencies {
     api(project(":kirc-core"))
     api(project(":kirc-image"))