From ff21676a4641f2b29002aa3681c5d8787efed9b8 Mon Sep 17 00:00:00 2001 From: Sten Roger Sandvik Date: Sun, 4 Dec 2016 13:43:19 +0100 Subject: [PATCH] Released 1.0.1 --- CHANGELOG.md | 6 ++++ docs/grunt.md | 2 +- docs/gulp.md | 2 +- docs/installing.md | 10 +++--- docs/node.md | 2 +- gradle.properties | 2 +- gradle/buildscript.gradle | 4 +++ gradle/publishing.gradle | 65 ++++++++++++++++----------------------- 8 files changed, 46 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2a6bb..42114e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +Version 1.0.1 *(2016-12-04)* +---------------------------- + +* Publish directly to plugins.gradle.org instead of bintray (#172) +* Fixed problem with resolving Grunt and Gulp plugins (#170) + Version 1.0.0 *(2016-12-02)* ---------------------------- diff --git a/docs/grunt.md b/docs/grunt.md index 3bab0cf..7415f9e 100644 --- a/docs/grunt.md +++ b/docs/grunt.md @@ -6,7 +6,7 @@ start using the plugin, add this into your `build.gradle` file (see [Installing] ```gradle plugins { - id "com.moowork.grunt" version "1.0.0" + id "com.moowork.grunt" version "1.0.1" } ``` diff --git a/docs/gulp.md b/docs/gulp.md index 7f0eebc..57d4687 100644 --- a/docs/gulp.md +++ b/docs/gulp.md @@ -6,7 +6,7 @@ To start using the plugin, add this into your `build.gradle` file (see [Installi ```gradle plugins { - id "com.moowork.gulp" version "1.0.0" + id "com.moowork.gulp" version "1.0.1" } ``` diff --git a/docs/installing.md b/docs/installing.md index 28d6955..a7c37b4 100644 --- a/docs/installing.md +++ b/docs/installing.md @@ -5,7 +5,7 @@ in your `build.gradle` file: ```gradle plugins { - id "com.moowork.node" version "1.0.0" + id "com.moowork.node" version "1.0.1" } ``` @@ -13,9 +13,9 @@ If you want to install all of the node-plugins (which is pretty uncommon), then ```gradle plugins { - id "com.moowork.node" version "1.0.0" - id "com.moowork.grunt" version "1.0.0" - id "com.moowork.gulp" version "1.0.0" + id "com.moowork.node" version "1.0.1" + id "com.moowork.grunt" version "1.0.1" + id "com.moowork.gulp" version "1.0.1" } ``` @@ -30,7 +30,7 @@ buildscript { } dependencies { - classpath "com.moowork.gradle:gradle-node-plugin:1.0.0" + classpath "com.moowork.gradle:gradle-node-plugin:1.0.1" } } diff --git a/docs/node.md b/docs/node.md index 0af0f60..f4d16a6 100644 --- a/docs/node.md +++ b/docs/node.md @@ -10,7 +10,7 @@ file (see [Installing](installing.md) for details): ```gradle plugins { - id "com.moowork.node" version "1.0.0" + id "com.moowork.node" version "1.0.1" } ``` diff --git a/gradle.properties b/gradle.properties index 30fdd30..bb1653d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ # # Current version # -version = 1.0.1-SNAPSHOT +version = 1.0.1 diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle index 472490b..e29d8dd 100644 --- a/gradle/buildscript.gradle +++ b/gradle/buildscript.gradle @@ -1,8 +1,12 @@ repositories { jcenter() + maven { + url "https://plugins.gradle.org/m2/" + } } 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 8382514..d0cc859 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -1,12 +1,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' apply plugin: 'com.jfrog.artifactory' - -ext { - bintrayUser = resolveProperty( 'BINTRAY_USER', 'bintrayUser' ) - bintrayKey = resolveProperty( 'BINTRAY_KEY', 'bintrayKey' ) -} +apply plugin: 'com.gradle.plugin-publish' publishing { publications { @@ -19,31 +14,6 @@ publishing { } } -bintray { - user = bintrayUser - key = bintrayKey - publications = ['mavenJava'] - - pkg { - repo = 'maven' - name = 'gradle-node-plugin' - desc = 'Gradle plugin for executing node scripts.' - 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'] - publicDownloadNumbers = true - - 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}"]] - } - } -} - artifactoryPublish { onlyIf { isMaster } mustRunAfter 'build' @@ -63,14 +33,33 @@ artifactory { } } -String resolveProperty( String envVarKey, String projectPropKey ) -{ - String propValue = System.getenv()[envVarKey] +pluginBundle { + website = 'https://github.com/srs/gradle-node-plugin' + vcsUrl = 'https://github.com/srs/gradle-node-plugin' - if ( propValue ) - { - return propValue + 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'] + } } - hasProperty( projectPropKey ) ? getProperty( projectPropKey ) : null + mavenCoordinates { + groupId = 'com.moowork.gradle' + artifactId = 'gradle-node-plugin' + } }