Merge branch 'release/0.6.0'

pc035860 · Mar 20, 2016 · 3b7995b · 3b7995b
2 parents 2c0b320 + 9eba488
commit 3b7995b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ AngularJS directive for syntax highlighting with [highlight.js](http://highlight
 
 ## Requirements
 
-* Highlight.js (.js & .css)
+* Highlight.js v7.0.0+
 * AngularJS v1.0.1+
 
 
@@ -39,7 +39,6 @@ angular.module('myApp', ['hljs']);
 ## Install with npm
 
 ```sh
-npm install highlight.js
 npm install angular-highlightjs
 ```
 

diff --git a/angular-highlightjs.js b/angular-highlightjs.js
@@ -1,6 +1,6 @@
 /*! angular-highlightjs
-version: 0.5.1
-build date: 2015-11-08
+version: 0.6.0
+build date: 2016-03-20
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
 

diff --git a/angular-highlightjs.min.js b/angular-highlightjs.min.js
diff --git a/build/angular-highlightjs.js b/build/angular-highlightjs.js
@@ -1,6 +1,6 @@
 /*! angular-highlightjs
-version: 0.5.1
-build date: 2015-11-08
+version: 0.6.0
+build date: 2016-03-20
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
 

diff --git a/build/angular-highlightjs.min.js b/build/angular-highlightjs.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-highlightjs",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "AngularJS directive for syntax highlighting with highlight.js",
   "main": "./build/angular-highlightjs.js",
   "directories": {},
@@ -32,5 +32,8 @@
     "grunt-contrib-watch": "^0.6.0",
     "grunt-ng-annotate": "^1.0.1"
   },
-  "dependencies": {}
+  "dependencies": {
+    "angular": "^1.0.1",
+    "highlight.js": ">7.0.0"
+  }
 }