diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -0,0 +1,5 @@ +subprojects { p -> + plugins.withId('java') { + p.archivesBaseName = "$rootProject.name-$p.name"; + } +} \ No newline at end of file diff --git a/mercurial/build.gradle b/mercurial/build.gradle --- a/mercurial/build.gradle +++ b/mercurial/build.gradle @@ -1,6 +1,8 @@ plugins { id "java-gradle-plugin" - id "com.gradle.plugin-publish" version "0.16.0" + id "com.gradle.plugin-publish" version "0.20.0" + // Apply the Maven Publish Plugin to have it generate the publication metadata + id 'maven-publish' } repositories { @@ -12,8 +14,6 @@ gradlePlugin { mercurialPlugin { id = 'org.implab.gradle-mercurial' implementationClass = 'org.implab.gradle.mercurial.MercurialPlugin' - displayName = "Integrates mercurial into the build script" - description = 'Automatically calculates version using tags. Simple wrapper around cli.' } } } @@ -22,5 +22,17 @@ pluginBundle { website = 'https://code.implab.org/implab/gradle-mercurial-plugin' vcsUrl = 'https://code.implab.org/implab/gradle-mercurial-plugin' - tags = ['hg', 'mercurial'] + plugins { + mercurialPlugin { + displayName = "Integrates mercurial into the build script" + description = 'Automatically calculates version using tags. Simple wrapper around cli.' + tags = ['hg', 'mercurial', 'versioning'] + } + } } + +task printVersion { + doLast { + println "${->jar.archiveFileName.get()}" + } +} \ No newline at end of file diff --git a/readme.md b/readme.md --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ ```groovy plugins { - id 'org.implab.gradle-mercurial' version '1.0' + id 'org.implab.gradle-mercurial' version '1.0.0' // or specify latest version } mercurial { diff --git a/settings.gradle b/settings.gradle --- a/settings.gradle +++ b/settings.gradle @@ -8,6 +8,6 @@ * in the user guide at https://docs.gradle.org/3.5/userguide/multi_project_builds.html */ -rootProject.name = 'plugins' +rootProject.name = 'implab-gradle' include 'mercurial'