From 92458976355c3766651b4697597b661a0a60e671 Mon Sep 17 00:00:00 2001 From: Sten Roger Sandvik Date: Mon, 16 Jan 2017 08:00:14 +0100 Subject: [PATCH] Released 1.1.1 --- CHANGELOG.md | 5 ++++ gradle.properties | 2 +- gradle/buildscript.gradle | 1 + gradle/publishing.gradle | 50 +++++++++++++++++++++------------------ 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c63bd..e80832a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========= +Version 1.1.1 *(2017-01-16)* +---------------------------- + +* Plugin publishing problems (#188) + Version 1.1.0 *(2017-01-13)* ---------------------------- diff --git a/gradle.properties b/gradle.properties index a6275bd..e87bedb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ # # Current version # -version = 1.2.0-SNAPSHOT +version = 1.1.1 diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle index 218b637..e29d8dd 100644 --- a/gradle/buildscript.gradle +++ b/gradle/buildscript.gradle @@ -8,4 +8,5 @@ repositories { dependencies { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0' + classpath 'com.gradle.publish:plugin-publish-plugin:0.9.6' } diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index e8082a7..31b6f1f 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -1,7 +1,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'com.jfrog.artifactory' -apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.gradle.plugin-publish' ext { bintrayUser = resolveProperty( 'BINTRAY_USER', 'bintrayUser' ) @@ -38,31 +38,35 @@ artifactory { } } -bintray { - user = bintrayUser - key = bintrayKey - publications = ['mavenJava'] - publish = true +pluginBundle { + website = 'https://github.com/srs/gradle-node-plugin' + vcsUrl = 'https://github.com/srs/gradle-node-plugin' - pkg { - repo = 'maven' - name = 'gradle-node-plugin' - desc = 'Gradle plugin for executing node scripts. Includes support for Yarn, Grunt and Gulp.' - websiteUrl = 'https://github.com/srs/gradle-node-plugin' - issueTrackerUrl = 'https://github.com/srs/gradle-node-plugin/issues' - vcsUrl = 'https://github.com/srs/gradle-node-plugin.git' - licenses = ['Apache-2.0'] - labels = ['java', 'gradle', 'groovy', 'node', 'gulp', 'grunt'] - publicDownloadNumbers = true - githubRepo = "srs/gradle-node-plugin" - - version { - vcsTag = "v$project.version" - attributes = ['gradle-plugin': ["com.moowork.node:${project.group}:${project.name}", - "com.moowork.grunt:${project.group}:${project.name}", - "com.moowork.gulp:${project.group}:${project.name}"]] + plugins { + nodePlugin { + id = 'com.moowork.node' + displayName = 'Gradle Node Plugin' + description = 'Gradle plugin for executing node scripts.' + tags = ['java', 'gradle', 'node', 'yarn', 'npm'] + } + gruntPlugin { + id = 'com.moowork.grunt' + displayName = 'Gradle Grunt Plugin' + description = 'Gradle pluign for executing grunt builds.' + tags = ['java', 'gradle', 'node', 'yarn', 'npm', 'grunt'] + } + gulpPlugin { + id = 'com.moowork.gulp' + displayName = 'Gradle Gulp Plugin' + description = 'Gradle plugin for executing gulp builds.' + tags = ['java', 'gradle', 'node', 'yarn', 'npm', 'gulp'] } } + + mavenCoordinates { + groupId = 'com.moowork.gradle' + artifactId = 'gradle-node-plugin' + } } String resolveProperty( String envVarKey, String projectPropKey )