Skip to content

Commit ff21676

Browse files
author
Sten Roger Sandvik
committed
Released 1.0.1
1 parent 022b7b0 commit ff21676

File tree

8 files changed

+46
-47
lines changed

8 files changed

+46
-47
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Changelog
22
=========
33

4+
Version 1.0.1 *(2016-12-04)*
5+
----------------------------
6+
7+
* Publish directly to plugins.gradle.org instead of bintray (#172)
8+
* Fixed problem with resolving Grunt and Gulp plugins (#170)
9+
410
Version 1.0.0 *(2016-12-02)*
511
----------------------------
612

docs/grunt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ start using the plugin, add this into your `build.gradle` file (see [Installing]
66

77
```gradle
88
plugins {
9-
id "com.moowork.grunt" version "1.0.0"
9+
id "com.moowork.grunt" version "1.0.1"
1010
}
1111
```
1212

docs/gulp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To start using the plugin, add this into your `build.gradle` file (see [Installi
66

77
```gradle
88
plugins {
9-
id "com.moowork.gulp" version "1.0.0"
9+
id "com.moowork.gulp" version "1.0.1"
1010
}
1111
```
1212

docs/installing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ in your `build.gradle` file:
55

66
```gradle
77
plugins {
8-
id "com.moowork.node" version "1.0.0"
8+
id "com.moowork.node" version "1.0.1"
99
}
1010
```
1111

1212
If you want to install all of the node-plugins (which is pretty uncommon), then write this:
1313

1414
```gradle
1515
plugins {
16-
id "com.moowork.node" version "1.0.0"
17-
id "com.moowork.grunt" version "1.0.0"
18-
id "com.moowork.gulp" version "1.0.0"
16+
id "com.moowork.node" version "1.0.1"
17+
id "com.moowork.grunt" version "1.0.1"
18+
id "com.moowork.gulp" version "1.0.1"
1919
}
2020
```
2121

@@ -30,7 +30,7 @@ buildscript {
3030
}
3131
3232
dependencies {
33-
classpath "com.moowork.gradle:gradle-node-plugin:1.0.0"
33+
classpath "com.moowork.gradle:gradle-node-plugin:1.0.1"
3434
}
3535
}
3636

docs/node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ file (see [Installing](installing.md) for details):
1010

1111
```gradle
1212
plugins {
13-
id "com.moowork.node" version "1.0.0"
13+
id "com.moowork.node" version "1.0.1"
1414
}
1515
```
1616

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#
22
# Current version
33
#
4-
version = 1.0.1-SNAPSHOT
4+
version = 1.0.1

gradle/buildscript.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
repositories {
22
jcenter()
3+
maven {
4+
url "https://plugins.gradle.org/m2/"
5+
}
36
}
47

58
dependencies {
69
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
710
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0'
11+
classpath 'com.gradle.publish:plugin-publish-plugin:0.9.6'
812
}

gradle/publishing.gradle

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
apply plugin: 'maven'
22
apply plugin: 'maven-publish'
3-
apply plugin: 'com.jfrog.bintray'
43
apply plugin: 'com.jfrog.artifactory'
5-
6-
ext {
7-
bintrayUser = resolveProperty( 'BINTRAY_USER', 'bintrayUser' )
8-
bintrayKey = resolveProperty( 'BINTRAY_KEY', 'bintrayKey' )
9-
}
4+
apply plugin: 'com.gradle.plugin-publish'
105

116
publishing {
127
publications {
@@ -19,31 +14,6 @@ publishing {
1914
}
2015
}
2116

22-
bintray {
23-
user = bintrayUser
24-
key = bintrayKey
25-
publications = ['mavenJava']
26-
27-
pkg {
28-
repo = 'maven'
29-
name = 'gradle-node-plugin'
30-
desc = 'Gradle plugin for executing node scripts.'
31-
websiteUrl = 'https://github.com/srs/gradle-node-plugin'
32-
issueTrackerUrl = 'https://github.com/srs/gradle-node-plugin/issues'
33-
vcsUrl = 'https://github.com/srs/gradle-node-plugin.git'
34-
licenses = ['Apache-2.0']
35-
labels = ['java', 'gradle', 'groovy', 'node']
36-
publicDownloadNumbers = true
37-
38-
version {
39-
vcsTag = "v$project.version"
40-
attributes = ['gradle-plugin': ["com.moowork.node:${project.group}:${project.name}",
41-
"com.moowork.grunt:${project.group}:${project.name}",
42-
"com.moowork.gulp:${project.group}:${project.name}"]]
43-
}
44-
}
45-
}
46-
4717
artifactoryPublish {
4818
onlyIf { isMaster }
4919
mustRunAfter 'build'
@@ -63,14 +33,33 @@ artifactory {
6333
}
6434
}
6535

66-
String resolveProperty( String envVarKey, String projectPropKey )
67-
{
68-
String propValue = System.getenv()[envVarKey]
36+
pluginBundle {
37+
website = 'https://github.com/srs/gradle-node-plugin'
38+
vcsUrl = 'https://github.com/srs/gradle-node-plugin'
6939

70-
if ( propValue )
71-
{
72-
return propValue
40+
plugins {
41+
nodePlugin {
42+
id = 'com.moowork.node'
43+
displayName = 'Gradle Node Plugin'
44+
description = 'Gradle plugin for executing node scripts.'
45+
tags = ['java', 'gradle', 'node', 'yarn', 'npm']
46+
}
47+
gruntPlugin {
48+
id = 'com.moowork.grunt'
49+
displayName = 'Gradle Grunt Plugin'
50+
description = 'Gradle pluign for executing grunt builds.'
51+
tags = ['java', 'gradle', 'node', 'yarn', 'npm', 'grunt']
52+
}
53+
gulpPlugin {
54+
id = 'com.moowork.gulp'
55+
displayName = 'Gradle Gulp Plugin'
56+
description = 'Gradle plugin for executing gulp builds.'
57+
tags = ['java', 'gradle', 'node', 'yarn', 'npm', 'gulp']
58+
}
7359
}
7460

75-
hasProperty( projectPropKey ) ? getProperty( projectPropKey ) : null
61+
mavenCoordinates {
62+
groupId = 'com.moowork.gradle'
63+
artifactId = 'gradle-node-plugin'
64+
}
7665
}

0 commit comments

Comments
 (0)