Update ngAnnotate to 1.2.1. Bumping version to 2.4.1. Fixes #13

craigburke · May 13, 2016 · 48996cf · 48996cf
1 parent 8006198
commit 48996cf
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/README.adoc b/README.adoc
@@ -1,6 +1,6 @@
-:version: 2.4.0
+:version: 2.4.1
 :apVersion: 2.5.0
-:ngAnnotateVersion: 1.0.2
+:ngAnnotateVersion: 1.2.1
 = AngularJs Annotate Asset-Pipeline
 
 The `angular-annotate-asset-pipeline` is an https://github.com/bertramdev/asset-pipeline-core[Asset Pipeline] module that provides annotations for dependecy injection to allow angular JavaScript or CofeeScript files to be minified in Gradle and Grails projects.

diff --git a/core/build.gradle b/core/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'groovy'
     id 'maven-publish'
     id 'com.moowork.node' version '0.10'
-    id 'com.jfrog.bintray' version '1.3.1'
+    id 'com.jfrog.bintray' version '1.6'
     id 'nebula.provided-base' version '2.2.2'
 }
 
@@ -14,16 +14,17 @@ repositories {
 
 targetCompatibility = 1.7
 group = 'com.craigburke.angular'
-version = '2.4.0'
+version = '2.4.1'
 
 node {
     download = true
 }
 
-project.ext {
+ext {
     sourceFile = file('node_modules/ng-annotate/build/es5/ng-annotate-main.js')
     destination = file('src/main/resources/ngannotate.js')
     npmDependencies = ['ng-annotate', 'webpack']
+    githubRepo = 'https://github.com/craigburke/angular-annotate-asset-pipeline'
 }
 
 dependencies {
@@ -60,11 +61,21 @@ bintray {
     user = project.hasProperty('bintrayUsername') ? project.bintrayUsername : ''
     key = project.hasProperty('bintrayApiKey') ? project.bintrayApiKey : ''
     publications = ['maven']
+    publish = true
+
     pkg {
         repo = 'asset-pipeline'
         userOrg = 'craigburke'
         name = 'angular-annotate-asset-pipeline'
         licenses = ['Apache-2.0']
+        githubRepo = 'craigburke/angular-annotate-asset-pipeline'
+        githubReleaseNotesFile = 'README.adoc'
+        version {
+            mavenCentralSync {
+                user = project.hasProperty('mavenCentralUsername') ? project.mavenCentralUsername : ''
+                password = project.hasProperty('mavenCentralPassword') ? project.mavenCentralPassword : ''
+            }
+        }
     }
 }
 
@@ -108,3 +119,4 @@ publishing {
 }
 
 bintrayUpload.dependsOn build, sourcesJar, javadocJar
+task('release', dependsOn: ['bintrayUpload'])
diff --git a/core/src/main/resources/ngannotate.js b/core/src/main/resources/ngannotate.js
diff --git a/grails-plugin/AngularAnnotateAssetPipelineGrailsPlugin.groovy b/grails-plugin/AngularAnnotateAssetPipelineGrailsPlugin.groovy
@@ -1,5 +1,5 @@
 class AngularAnnotateAssetPipelineGrailsPlugin {
-    def version = "2.4.0"
+    def version = "2.4.1"
     def grailsVersion = "2.0 > *"
 
     def title = "AngularJS Annotate Asset-Pipeline Plugin"

diff --git a/grails-plugin/grails-app/conf/BuildConfig.groovy b/grails-plugin/grails-app/conf/BuildConfig.groovy
@@ -14,7 +14,7 @@ grails.project.dependency.resolution = {
         mavenCentral()
     }
     dependencies {
-		compile "com.craigburke.angular:angular-annotate-asset-pipeline:2.4.0"
+		compile "com.craigburke.angular:angular-annotate-asset-pipeline:2.4.1"
     }
     plugins {