Update oci plugin to 0.16.0

hivemq · Sep 10, 2024 · 9760b32 · 9760b32
1 parent 9410bcf
commit 9760b32
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -258,9 +258,14 @@ testing {
                 implementation(project())
             }
 
-            ociImageDependencies {
-                runtime("hivemq:hivemq4:latest") { isChanging = true }
-                runtime("hivemq:hivemq-swarm:latest") { isChanging = true }
+            oci.of(this) {
+                imageDependencies {
+                    runtime("hivemq:hivemq4:latest") { isChanging = true }
+                    runtime("hivemq:hivemq-swarm:latest") { isChanging = true }
+                }
+                val linuxAmd64 = platformSelector(platform("linux", "amd64"))
+                val linuxArm64v8 = platformSelector(platform("linux", "arm64", "v8"))
+                platformSelector = if (System.getenv("CI_RUN") != null) linuxAmd64 else linuxAmd64.and(linuxArm64v8)
             }
         }
 
@@ -302,24 +307,19 @@ testing {
                 implementation(libs.hivemq.mqttClient)
             }
 
-            ociImageDependencies {
-                runtime(project).tag("latest")
+            oci.of(this) {
+                imageDependencies {
+                    runtime(project).tag("latest")
+                }
+                val linuxAmd64 = platformSelector(platform("linux", "amd64"))
+                val linuxArm64v8 = platformSelector(platform("linux", "arm64", "v8"))
+                platformSelector = if (System.getenv("CI_RUN") != null) linuxAmd64 else linuxAmd64.and(linuxArm64v8)
             }
         }
 
         tasks.named("check") {
             dependsOn(integrationTest, systemTest)
         }
-
-        tasks.named("integrationTestOciRegistryData", oci.imagesTaskClass) {
-            val linuxAmd64 = oci.platformSelector(oci.platform("linux", "amd64"))
-            val linuxArm64v8 = oci.platformSelector(oci.platform("linux", "arm64", "v8"))
-            platformSelector = if (System.getenv("CI_RUN") != null) {
-                linuxAmd64
-            } else {
-                linuxAmd64.and(linuxArm64v8)
-            }
-        }
     }
 }
 
@@ -631,8 +631,8 @@ oci {
     }
     imageDefinitions.register("main") {
         allPlatforms {
-            parentImages {
-                add("library:eclipse-temurin:sha256!ea878d7ef79653c16f6bfdfbd3bf20ae80f4f645f66339e9153ae0d481385225") // 21.0.4_7-jre-jammy
+            dependencies {
+                runtime("library:eclipse-temurin:sha256!ea878d7ef79653c16f6bfdfbd3bf20ae80f4f645f66339e9153ae0d481385225") // 21.0.4_7-jre-jammy
             }
             config {
                 entryPoint.add("java")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -83,6 +83,6 @@ graalvm-native = { id = "org.graalvm.buildtools.native", version = "0.10.2" }
 launch4j = { id = "edu.sc.seis.launch4j", version = "3.0.6" }
 license = { id = "com.github.hierynomus.license", version = "0.16.1" }
 nebula-ospackage = { id = "com.netflix.nebula.ospackage", version = "11.10.0" }
-oci = { id = "io.github.sgtsilvio.gradle.oci", version = "0.15.1" }
+oci = { id = "io.github.sgtsilvio.gradle.oci", version = "0.16.0" }
 openapi-generator = { id = "org.openapi.generator", version = "7.8.0" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }