Skip to content
This repository was archived by the owner on Nov 30, 2018. It is now read-only.

Commit 2885237

Browse files
committed
issue #1729 working but specs broke
1 parent 701a466 commit 2885237

17 files changed

+17084
-46
lines changed

Gruntfile.coffee

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ module.exports = (grunt) ->
5656
grunt.registerTask 'build', ['bowerCurl', 'clean:dist', 'jshint', 'mkdir', 'coffee', 'ngAnnotate',
5757
'concat:libs', 'replace', 'webpack']
5858

59-
grunt.registerTask "default", [ 'verbosity', 'build', 'concat:dist', 'copy', 'uglify:dist', 'uglify:streetview', 'karma']
59+
grunt.registerTask 'buildDist', ['build', 'concat:dist']
60+
61+
grunt.registerTask "default", [ 'verbosity', 'buildDist', 'copy', 'uglify:dist', 'uglify:streetview', 'karma']
6062

6163
grunt.registerTask "buildAll", [ "build", "concat",
6264
"uglify", "copy", "karma", "graph"]
6365

6466
# run default "grunt" prior to generate _SpecRunner.html
65-
grunt.registerTask "spec", [ 'verbosity', "build", "concat:dist",
67+
grunt.registerTask "spec", [ 'verbosity', "buildDist",
6668
"copy", "karma", "open:jasmine", "watch:spec"]
6769

6870
grunt.registerTask "coverage", ['connect:coverage','open:coverage', "watch:spec"]

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.3.1",
44
"main": "./dist/angular-google-maps.js",
55
"dependencies": {
6-
"angular": "1.2 - 1.4",
6+
"angular": "1.2 - 1.5",
77
"angular-simple-logger": ">=0.0.1",
88
"lodash": "3.X - 4.X"
99
},
@@ -27,8 +27,8 @@
2727
"dist/architecture/"
2828
],
2929
"devDependencies": {
30-
"angular-mocks": "1.2 - 1.4",
31-
"angular-route": "1.2 - 1.4",
30+
"angular-mocks": "1.2 - 1.5",
31+
"angular-route": "1.2 - 1.5",
3232
"bootstrap-without-jquery": "git://github.com/tagawa/bootstrap-without-jquery.git",
3333
"data-structures": "~1.4.2",
3434
"OverlappingMarkerSpiderfier": "git://github.com/nmccready/OverlappingMarkerSpiderfier.git",

0 commit comments

Comments
 (0)