From 466f7bcac8e1c0a1b131db3105014ce7940c361e Mon Sep 17 00:00:00 2001 From: Choko Date: Wed, 12 Jun 2019 14:53:40 +0900 Subject: [PATCH] Curiostack 0.0.184 (#369) * Use current gradle-jib-plugin version and update to latest API. (#368) * Release 0.0.184.3 --- .../gradle-curiostack-plugin/gradle.properties | 2 +- tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts | 2 +- tools/gradle-plugins/gradle-golang-plugin/gradle.properties | 2 +- .../java/org/curioswitch/gradle/golang/tasks/JibTask.java | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties index 754f2fd42..6e9d24ea2 100644 --- a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties +++ b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties @@ -22,4 +22,4 @@ # SOFTWARE. # -version = 0.0.184.2 +version = 0.0.184.3 diff --git a/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts b/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts index 094a7e75b..84c9f3461 100644 --- a/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts +++ b/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts @@ -33,8 +33,8 @@ dependencies { compile(project(":tools:gradle-plugins:gradle-tool-downloader-plugin")) compile(project(":tools:gradle-plugins:gradle-helpers")) - compile("com.google.cloud.tools:jib-gradle-plugin:0.10.2-RAG1") compile("com.google.guava:guava") + compile("gradle.plugin.com.google.cloud.tools:jib-gradle-plugin") annotationProcessor("org.immutables:value") compileOnly("org.immutables:value-annotations") diff --git a/tools/gradle-plugins/gradle-golang-plugin/gradle.properties b/tools/gradle-plugins/gradle-golang-plugin/gradle.properties index a457a5589..b997e9f79 100644 --- a/tools/gradle-plugins/gradle-golang-plugin/gradle.properties +++ b/tools/gradle-plugins/gradle-golang-plugin/gradle.properties @@ -22,4 +22,4 @@ # SOFTWARE. # -version = 0.0.18 +version = 0.0.19 diff --git a/tools/gradle-plugins/gradle-golang-plugin/src/main/java/org/curioswitch/gradle/golang/tasks/JibTask.java b/tools/gradle-plugins/gradle-golang-plugin/src/main/java/org/curioswitch/gradle/golang/tasks/JibTask.java index 89fc72ca0..a069e481c 100644 --- a/tools/gradle-plugins/gradle-golang-plugin/src/main/java/org/curioswitch/gradle/golang/tasks/JibTask.java +++ b/tools/gradle-plugins/gradle-golang-plugin/src/main/java/org/curioswitch/gradle/golang/tasks/JibTask.java @@ -32,6 +32,7 @@ import com.google.cloud.tools.jib.configuration.Port; import com.google.cloud.tools.jib.filesystem.AbsoluteUnixPath; import com.google.cloud.tools.jib.frontend.CredentialRetrieverFactory; +import com.google.cloud.tools.jib.image.ImageReference; import java.nio.file.Path; import org.curioswitch.gradle.golang.GolangExtension; import org.gradle.api.DefaultTask; @@ -114,10 +115,10 @@ public void exec() throws Exception { var targetImage = RegistryImage.named(this.targetImage.get()); if (credentialHelper.isPresent()) { baseImage.addCredentialRetriever( - CredentialRetrieverFactory.forImage(baseImage.toImageConfiguration().getImage()) + CredentialRetrieverFactory.forImage(ImageReference.parse(this.baseImage.get())) .dockerCredentialHelper(credentialHelper.get())); targetImage.addCredentialRetriever( - CredentialRetrieverFactory.forImage(targetImage.toImageConfiguration().getImage()) + CredentialRetrieverFactory.forImage(ImageReference.parse(this.targetImage.get())) .dockerCredentialHelper(credentialHelper.get())); }