Skip to content

Commit

Permalink
Released 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Sten Roger Sandvik committed Dec 4, 2016
1 parent 022b7b0 commit ff21676
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 47 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)*
----------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/grunt.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/gulp.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down
10 changes: 5 additions & 5 deletions docs/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ in your `build.gradle` file:

```gradle
plugins {
id "com.moowork.node" version "1.0.0"
id "com.moowork.node" version "1.0.1"
}
```

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

```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"
}
```

Expand All @@ -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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/node.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
# Current version
#
version = 1.0.1-SNAPSHOT
version = 1.0.1
4 changes: 4 additions & 0 deletions gradle/buildscript.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
65 changes: 27 additions & 38 deletions gradle/publishing.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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'
Expand All @@ -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'
}
}

0 comments on commit ff21676

Please sign in to comment.