Skip to content

Commit 0c9be4c

Browse files
Merge pull request #431 from owncloud/chore/remove-unused-deps
chore: drop unused and partially outdated dependencies
2 parents 9da6168 + 7463ef8 commit 0c9be4c

File tree

3 files changed

+2
-40
lines changed

3 files changed

+2
-40
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,4 @@ Various
231231
*.rej
232232

233233
build/
234+
js/yarn.lock

Diff for: js/Gruntfile.js

-35
Original file line numberDiff line numberDiff line change
@@ -82,43 +82,8 @@ module.exports = function(grunt) {
8282
},
8383
tasks: ['js']
8484
}
85-
},
86-
karma: {
87-
unit: {
88-
configFile: 'config/karma.js'
89-
},
90-
continuous: {
91-
configFile: 'config/karma.js',
92-
singleRun: true,
93-
browsers: ['PhantomJS'],
94-
reporters: ['progress', 'junit'],
95-
junitReporter: {
96-
outputFile: 'test-results.xml'
97-
}
98-
},
99-
unit_phantom: {
100-
configFile: 'config/karma.js',
101-
browsers: ['PhantomJS']
102-
}
103-
},
104-
phpunit: {
105-
classes: {
106-
dir: '../tests'
107-
},
108-
options: {
109-
colors: true
110-
}
111-
},
112-
phpdocumentor: {
113-
"default": {
114-
options: {
115-
directory: '../appinfo,../db,../controllers,../service',
116-
target: '../docs'
117-
}
118-
}
11985
}
12086
});
121-
grunt.registerTask('ci', ['karma:continuous']);
12287
grunt.registerTask('js', ['concat', 'wrap']);
12388
grunt.registerTask('default', 'js');
12489
};

Diff for: js/package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,8 @@
2525
"grunt-contrib-concat": "~0.1.2",
2626
"grunt-contrib-less": "~0.6.4",
2727
"grunt-contrib-watch": "~0.2.0",
28-
"grunt-karma": "~0.4.5",
2928
"grunt-newer": "~1.1.1",
30-
"grunt-phpdocumentor": "^0.4.1",
31-
"grunt-phpunit": "0.2.0",
32-
"grunt-wrap": "~0.2.0",
33-
"phantomjs": "~1.8.1-3"
29+
"grunt-wrap": "~0.2.0"
3430
},
3531
"engine": "node >= 0.8"
3632
}

0 commit comments

Comments
 (0)