From c8caa587861d254d57efd9791a4f0640cd3f412a Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 21 Sep 2022 12:00:34 -0400 Subject: [PATCH] ml-development-tools now uses 1.0.0 of publish plugin Per the docs at https://docs.gradle.org/current/userguide/publishing_gradle_plugins.html . This should hopefully fix the error we're getting from the Gradle plugins site about hash collisions on javadoc and groovydoc. --- ml-development-tools/build.gradle | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/ml-development-tools/build.gradle b/ml-development-tools/build.gradle index a648d0296..57a0d3501 100644 --- a/ml-development-tools/build.gradle +++ b/ml-development-tools/build.gradle @@ -1,7 +1,7 @@ plugins { id "groovy" id 'maven-publish' - id 'com.gradle.plugin-publish' version '0.12.0' + id 'com.gradle.plugin-publish' version '1.0.0' id 'java-gradle-plugin' id 'org.jetbrains.kotlin.jvm' version '1.3.72' } @@ -26,6 +26,11 @@ task mlDevelopmentToolsJar(type: Jar, dependsOn: classes) { archivesBaseName = 'ml-development-tools' } +pluginBundle { + website = 'https://github.com/marklogic/java-client-api' + vcsUrl = 'git@github.com:marklogic/java-client-api.git' + tags = ['marklogic'] +} gradlePlugin { plugins { mlDevelopmentToolsPlugin { @@ -33,7 +38,6 @@ gradlePlugin { implementationClass = 'com.marklogic.client.tools.gradle.ToolsPlugin' displayName = 'ml-development-tools MarkLogic Data Service Tools' description = 'ml-development-tools plugin for developing data services on MarkLogic' - version = project.version } } } @@ -46,20 +50,6 @@ publishing { } } -pluginBundle { - website = 'https://github.com/marklogic/java-client-api' - vcsUrl = 'git@github.com:marklogic/java-client-api.git' - plugins { - mlDevelopmentToolsPlugin { - id = 'com.marklogic.ml-development-tools' - displayName = 'ml-development-tools MarkLogic Data Service Tools' - description = 'ml-development-tools plugin for developing data services on MarkLogic' - tags = ['marklogic', 'development tools', 'data services'] - version = project.version - } - } -} - compileKotlin { kotlinOptions.jvmTarget = '1.8' }