diff --git a/.gitignore b/.gitignore index 7e9e681..5caf859 100755 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ out .settings bin .DS_Store +.java-version diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..0d8de90 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8.0.342 diff --git a/eventuate-plugins-gradle-publish/build.gradle b/eventuate-plugins-gradle-publish/build.gradle index 129a17f..ca755a2 100644 --- a/eventuate-plugins-gradle-publish/build.gradle +++ b/eventuate-plugins-gradle-publish/build.gradle @@ -5,7 +5,8 @@ repositories { } } -dependencies { - implementation "io.github.gradle-nexus:publish-plugin:1.0.0" +apply plugin: 'java' +dependencies { + implementation "io.github.gradle-nexus:publish-plugin:1.1.0" } diff --git a/eventuate-plugins-gradle-publish/src/main/groovy/io/eventuate/plugins/gradle/publish/PublishEventuateDockerImagesTask.groovy b/eventuate-plugins-gradle-publish/src/main/groovy/io/eventuate/plugins/gradle/publish/PublishEventuateDockerImagesTask.groovy index 9b17247..f7ead06 100644 --- a/eventuate-plugins-gradle-publish/src/main/groovy/io/eventuate/plugins/gradle/publish/PublishEventuateDockerImagesTask.groovy +++ b/eventuate-plugins-gradle-publish/src/main/groovy/io/eventuate/plugins/gradle/publish/PublishEventuateDockerImagesTask.groovy @@ -1,6 +1,5 @@ package io.eventuate.plugins.gradle.publish -import org.gradle.StartParameter import org.gradle.api.tasks.GradleBuild class PublishEventuateDockerImagesTask extends GradleBuild { @@ -12,7 +11,7 @@ class PublishEventuateDockerImagesTask extends GradleBuild { if (branch == "master") { def version = project.version.replace("-SNAPSHOT", ".BUILD-SNAPSHOT") startParameter.projectProperties = ["dockerImageTag" : version, "version" : version] - setTasks(["publishComposeBuild", , "publishComposePush"]) + setTasks(["publishComposeBuild", "publishComposePush"]) } else if (branch.startsWith("wip-")) { def version = GitBranchUtil.getWipPublishingVersion(project) startParameter.projectProperties = ["dockerImageTag" : version, "version" : version]