Feature/platform variants

build.gradle.kts

@@ -20,7 +20,7 @@ metadata {
         }
     }
     github {
-        org = "sgtsilvio"
+        org = "SgtSilvio"
         issues()
     }
 }
@@ -56,7 +56,7 @@ gradlePlugin {
         create("oci") {
             id = "$group.$name"
             implementationClass = "$group.$name.OciPlugin"
-            tags = listOf("oci", "oci-image", "docker", "multi-arch")
+            tags = listOf("oci", "oci-image", "docker", "docker-image", "multi-arch")
         }
     }
 }

src/functionalTest/kotlin/io/github/sgtsilvio/gradle/oci/ConfigurationCacheTest.kt

@@ -26,11 +26,11 @@ internal class ConfigurationCacheTest {
         assertTrue(result.output.contains("Configuration cache entry stored"))
         assertEquals(TaskOutcome.SUCCESS, result.task(":jar")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":jarOciLayer")?.outcome)
-        assertEquals(TaskOutcome.SUCCESS, result.task(":ociComponent")?.outcome)
+        assertEquals(TaskOutcome.SUCCESS, result.task(":ociMetadata")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":testOciRegistryData")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":test")?.outcome)
         testProject.assertJarOciLayer()
-        testProject.assertOciComponent()
+        testProject.assertOciMetadata()
         testProject.assertTestOciRegistryData()
 
         testProject.buildDir.deleteRecursively()
@@ -44,11 +44,11 @@ internal class ConfigurationCacheTest {
         assertTrue(result2.output.contains("Configuration cache entry reused"))
         assertEquals(TaskOutcome.SUCCESS, result2.task(":jar")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result2.task(":jarOciLayer")?.outcome)
-        assertEquals(TaskOutcome.SUCCESS, result2.task(":ociComponent")?.outcome)
+        assertEquals(TaskOutcome.SUCCESS, result2.task(":ociMetadata")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result2.task(":testOciRegistryData")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result2.task(":test")?.outcome)
         testProject.assertJarOciLayer()
-        testProject.assertOciComponent()
+        testProject.assertOciMetadata()
         testProject.assertTestOciRegistryData()
     }
 }

src/functionalTest/kotlin/io/github/sgtsilvio/gradle/oci/GradleVersionsTest.kt

@@ -17,9 +17,8 @@ internal class GradleVersionsTest {
     @ValueSource(
         strings = [
             "7.4", // minimum version
-            "8.3", // highest version not fulfilling version check >= 8.4 in ModuleDependencyExtensions
-            "8.4", // lowest version fulfilling version check >= 8.4 in ModuleDependencyExtensions
-            "8.5", // lowest version fulfilling version check >= 8.5 in ModuleDependencyExtensions
+            "8.5", // highest version not fulfilling version check >= 8.6 in OciImageDefinitionImpl
+            "8.6", // lowest version fulfilling version check >= 8.6 in OciImageDefinitionImpl
         ]
     )
     fun test(gradleVersion: String, @TempDir projectDir: File) {
@@ -34,12 +33,12 @@ internal class GradleVersionsTest {
 
         assertEquals(TaskOutcome.SUCCESS, result.task(":jar")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":jarOciLayer")?.outcome)
-        assertEquals(TaskOutcome.SUCCESS, result.task(":ociComponent")?.outcome)
+        assertEquals(TaskOutcome.SUCCESS, result.task(":ociMetadata")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":testOciRegistryData")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":test")?.outcome)
         val isBeforeGradle8 = gradleVersion.startsWith('7')
         testProject.assertJarOciLayer(isBeforeGradle8)
-        testProject.assertOciComponent(isBeforeGradle8)
+        testProject.assertOciMetadata(isBeforeGradle8)
         testProject.assertTestOciRegistryData(isBeforeGradle8)
     }
 }

src/functionalTest/kotlin/io/github/sgtsilvio/gradle/oci/PublishMetadataTest.kt

@@ -94,7 +94,7 @@ internal class PublishMetadataTest {
 
         assertEquals(TaskOutcome.SUCCESS, result.task(":jar")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":jarOciLayer")?.outcome)
-        assertEquals(TaskOutcome.SUCCESS, result.task(":ociComponent")?.outcome)
+        assertEquals(TaskOutcome.SUCCESS, result.task(":ociMetadata")?.outcome)
         assertEquals(TaskOutcome.SUCCESS, result.task(":generateMetadataFileForMavenPublication")?.outcome)
 
         val moduleMetadata = JSONObject(projectDir.resolve("build/publications/maven/module.json").readText())
@@ -107,6 +107,7 @@ internal class PublishMetadataTest {
               "name": "ociImage",
               "attributes": {
                 "io.github.sgtsilvio.gradle.distributiontype": "oci-image",
+                "io.github.sgtsilvio.gradle.platform": "universal",
                 "org.gradle.category": "distribution",
                 "org.gradle.dependency.bundling": "external"
               },
@@ -119,13 +120,13 @@ internal class PublishMetadataTest {
               ],
               "files": [
                 {
-                  "name": "test-1.0.0-oci-component.json",
-                  "url": "test-1.0.0-oci-component.json",
-                  "size": 492,
-                  "sha512": "913ce805f2573fa3c291a04dc20fe0bbc2fd80b30a274671f3bf4fb20daa9025ec6a3828ddff4b57b2a5e2c4388e2d8779057f542643bf0a288f82551064a37c",
-                  "sha256": "aac0e2ec54b8570aa5319d97e89f43e3bace4b702aeab7553113935489e66c0f",
-                  "sha1": "5237ea4b551f2331dc7a38194cc690014ff0d33e",
-                  "md5": "5ac361c1c364157050ea3d060355bf47"
+                  "name": "test-1.0.0-oci-metadata.json",
+                  "url": "test-1.0.0-oci-metadata.json",
+                  "size": 313,
+                  "sha512": "746de5c093ac73f3b6b693f0d2e03c608d54d341eeaa57176b6b5f24653dc277b2f65cdb2912b9abdeaec49092265c0faf4aba44b9c152e7015a8a7719fd9ac9",
+                  "sha256": "3ad109eb16bdf9819d61d2e6a279041de00f063689726491d1325a58249efa90",
+                  "sha1": "21ed0e46e81711a45f1788274e1da164a42d9e94",
+                  "md5": "e6e8f26fe56934656689bc03eef083e1"
                 },
                 {
                   "name": "test-1.0.0-jar-oci-layer.tgz",

src/functionalTest/kotlin/io/github/sgtsilvio/gradle/oci/TestProject.kt

@@ -124,17 +124,17 @@ internal class TestProject(projectDir: File) {
         assertEquals("digest=$expectedDigest\nsize=704\ndiffId=$expectedDiffId", propertiesFile.readText())
     }
 
-    fun assertOciComponent(isBeforeGradle8: Boolean = false) {
+    fun assertOciMetadata(isBeforeGradle8: Boolean = false) {
         val imageDir = buildDir.resolve("oci/images/main")
-        val componentJsonFile = imageDir.resolve("oci-component.json")
-        assertTrue(componentJsonFile.exists())
+        val metadataJsonFile = imageDir.resolve("oci-metadata.json")
+        assertTrue(metadataJsonFile.exists())
         // https://docs.gradle.org/current/userguide/upgrading_version_7.html#reproducible_archives_can_change_compared_to_past_versions
         val expectedComponentJson = if (isBeforeGradle8) {
-            """{"imageReference":"example/test:1.0.0","capabilities":[{"group":"org.example","name":"test","version":"1.0.0"}],"bundle":{"parentCapabilities":[{"group":"library","name":"eclipse-temurin"}],"command":{"entryPoint":["java","-jar","app.jar"],"arguments":[]},"layers":[{"descriptor":{"digest":"sha256:9f0241cf6e0f2ddad911248fbb4592b18c4dff4d69e1dffa03080acfe61bce6c","size":704,"diffId":"sha256:f8363558d917871ea6722c762b6d4e67b0f2ac3be010ca94e4a74aead327212c"},"createdBy":"gradle-oci: jar"}]}}"""
+            """{"imageReference":"example/test:1.0.0","entryPoint":["java","-jar","app.jar"],"layers":[{"descriptor":{"digest":"sha256:9f0241cf6e0f2ddad911248fbb4592b18c4dff4d69e1dffa03080acfe61bce6c","size":704,"diffId":"sha256:f8363558d917871ea6722c762b6d4e67b0f2ac3be010ca94e4a74aead327212c"},"createdBy":"gradle-oci: jar"}]}"""
         } else {
-            """{"imageReference":"example/test:1.0.0","capabilities":[{"group":"org.example","name":"test","version":"1.0.0"}],"bundle":{"parentCapabilities":[{"group":"library","name":"eclipse-temurin"}],"command":{"entryPoint":["java","-jar","app.jar"],"arguments":[]},"layers":[{"descriptor":{"digest":"sha256:e6b88907d77d29e5dd75183b8c58e75d6abe195d0594c4b8b2282c4ce75a51f0","size":704,"diffId":"sha256:bf7023a316aaf2ae2ccd50dba4990f460cfbbd2b70ee08603c2e5452e48e0865"},"createdBy":"gradle-oci: jar"}]}}"""
+            """{"imageReference":"example/test:1.0.0","entryPoint":["java","-jar","app.jar"],"layers":[{"descriptor":{"digest":"sha256:e6b88907d77d29e5dd75183b8c58e75d6abe195d0594c4b8b2282c4ce75a51f0","size":704,"diffId":"sha256:bf7023a316aaf2ae2ccd50dba4990f460cfbbd2b70ee08603c2e5452e48e0865"},"createdBy":"gradle-oci: jar"}]}"""
         }
-        assertEquals(expectedComponentJson, componentJsonFile.readText())
+        assertEquals(expectedComponentJson, metadataJsonFile.readText())
     }
 
     fun assertTestOciRegistryData(isBeforeGradle8: Boolean = false) {
@@ -147,14 +147,14 @@ internal class TestProject(projectDir: File) {
         // https://docs.gradle.org/current/userguide/upgrading_version_7.html#reproducible_archives_can_change_compared_to_past_versions
         if (isBeforeGradle8) {
             expectedJarLayerDigest = "9f0241cf6e0f2ddad911248fbb4592b18c4dff4d69e1dffa03080acfe61bce6c"
-            expectedIndexDigest = "581c698db9bf7fc21809df9290c06687a1d40f7d6e22338fd544fe7cfc2c2ff2"
+            expectedIndexDigest = "63a0222f933874cb9a447957959f2e5dcc76f25580096f3dae7c06118d8dc198"
             expectedManifest1Digest = "37bf3695f5995dd5ec95ea0583a3fd53c543962fc4372993f7a6d39055e9ed16"
             expectedManifest2Digest = "61cedfd321a6a234f0cfb0c97506497af54405de24e7d63f3b3cd61fffdaacec"
             expectedConfig1Digest = "383b193872227cbe7e5f85742c3b3d5e9fe2f1db99b25d007d9d2d8b5ed4f6ef"
             expectedConfig2Digest = "c880e34f4fba15aa3ae99e494c1d73db3dba8d09abdeec1102a641ad377451d6"
         } else {
             expectedJarLayerDigest = "e6b88907d77d29e5dd75183b8c58e75d6abe195d0594c4b8b2282c4ce75a51f0"
-            expectedIndexDigest = "7f7843c962a8235352e0e11d331e6621a20634774d2e209f7f89a7b76e7857bc"
+            expectedIndexDigest = "524b2ffa869104df9d18697019ef0633ee3ce168ef3b7421b51f9628ac2b0809"
             expectedManifest1Digest = "10be4956d8ab1abc455e9a9260b67dcd2d6ca8febd42ea6049bab950a8a15edb"
             expectedManifest2Digest = "acd15ae115f4d1562c0ce83e8a628243c7b1130d90677b99ad9d29c95af39e0e"
             expectedConfig1Digest = "45c5e3d4ddbbd0b23a157b296cf09827dcd5b2bdb3323c58280948bd6955f8af"