Permalink
Browse files

Merge branch 'jasonsanjose/travis' of github.com:adobe/brackets into …

…jasonsanjose/travis
  • Loading branch information...
2 parents 21eca53 + 41a9728 commit 749e9527db481795dd1f65c98de3136ddddbd745 @jasonsanjose jasonsanjose committed Jan 28, 2013
Showing with 46 additions and 4 deletions.
  1. +2 −1 Gruntfile.js
  2. +2 −2 package.json
  3. +41 −1 src/config.json
  4. +1 −0 test/SpecRunner.html
View
@@ -43,6 +43,7 @@ module.exports = function (grunt) {
consolidate: true
},
specs : '<%= meta.specs %>',
+ /* Keep in sync with test/SpecRunner.html dependencies */
vendor : [
'src/thirdparty/jquery-1.7.js',
'src/thirdparty/CodeMirror2/lib/codemirror.js',
@@ -98,7 +99,7 @@ module.exports = function (grunt) {
}
});
- grunt.file.write("src/config.json", JSON.stringify(appConfigJSON));
+ grunt.file.write("src/config.json", JSON.stringify(appConfigJSON, null, " "));
});
// task: test
View
@@ -17,9 +17,9 @@
{
"grunt" : ">=0.4.0rc5",
"grunt-cli" : ">=0.1.6",
- "grunt-contrib-jshint" : "git://github.com/gruntjs/grunt-contrib-jshint.git#master",
+ "grunt-contrib-jshint" : ">=0.1.1rc6",
"grunt-contrib-watch" : ">=0.2.0rc5",
- "grunt-contrib-jasmine" : "git://github.com/gruntjs/grunt-contrib-jasmine.git#master",
+ "grunt-contrib-jasmine" : ">=0.3.0rc7",
"grunt-template-jasmine-requirejs" : ">=0.1.0"
},
"scripts" :
View
@@ -1 +1,41 @@
-{"name":"Brackets","homepage":"http://brackets.io","issues":{"url":"http://github.com/adobe/brackets/issues"},"repository":{"type":"git","url":"https://github.com/adobe/brackets.git","branch":"","SHA":""},"config":{"app_title":"Brackets","app_name_about":"Brackets","about_icon":"styles/images/brackets_icon.svg","show_debug_menu":true,"enable_jslint":true,"update_info_url":"http://dev.brackets.io/updates/stable/","how_to_use_url":"https://github.com/adobe/brackets/wiki/How-to-Use-Brackets","forum_url":"https://groups.google.com/forum/?fromgroups#!forum/brackets-dev","release_notes_url":"https://github.com/adobe/brackets/wiki/Release-Notes","report_issue_url":"https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue","twitter_url":"https://twitter.com/brackets","troubleshoot_url":"https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev","twitter_name":"@brackets"},"version":"0.20.0-0","devDependencies":{"grunt":">=0.4.0rc5","grunt-contrib-jshint":"git://github.com/gruntjs/grunt-contrib-jshint.git#master","grunt-contrib-watch":">=0.2.0rc5","grunt-contrib-jasmine":"git://github.com/gruntjs/grunt-contrib-jasmine.git#master","grunt-template-jasmine-requirejs":">=0.1.0","socket.io":">=0.9.13"},"scripts":{"install":"grunt install","test":"grunt test"}}
+{
+ "name": "Brackets",
+ "homepage": "http://brackets.io",
+ "issues": {
+ "url": "http://github.com/adobe/brackets/issues"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/adobe/brackets.git",
+ "branch": "",
+ "SHA": ""
+ },
+ "config": {
+ "app_title": "Brackets",
+ "app_name_about": "Brackets",
+ "about_icon": "styles/images/brackets_icon.svg",
+ "show_debug_menu": true,
+ "enable_jslint": true,
+ "update_info_url": "http://dev.brackets.io/updates/stable/",
+ "how_to_use_url": "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
+ "forum_url": "https://groups.google.com/forum/?fromgroups#!forum/brackets-dev",
+ "release_notes_url": "https://github.com/adobe/brackets/wiki/Release-Notes",
+ "report_issue_url": "https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue",
+ "twitter_url": "https://twitter.com/brackets",
+ "troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev",
+ "twitter_name": "@brackets"
+ },
+ "version": "0.20.0-0",
+ "devDependencies": {
+ "grunt": ">=0.4.0rc5",
+ "grunt-cli": ">=0.1.6",
+ "grunt-contrib-jshint": ">=0.1.1rc6",
+ "grunt-contrib-watch": ">=0.2.0rc5",
+ "grunt-contrib-jasmine": ">=0.3.0rc7",
+ "grunt-template-jasmine-requirejs": ">=0.1.0"
+ },
+ "scripts": {
+ "postinstall": "grunt install",
+ "test": "grunt test"
+ }
+}
@@ -34,6 +34,7 @@
<script src="thirdparty/jasmine-core/jasmine.js"></script>
<!-- Pre-load third party scripts that cannot be async loaded. -->
+ <!-- Keep in sync with Gruntfile.js jasmine vendor dependencies -->
<script src="../src/thirdparty/jquery-1.7.min.js"></script>
<script src="../src/thirdparty/CodeMirror2/lib/codemirror.js"></script>
<script src="../src/thirdparty/CodeMirror2/lib/util/dialog.js"></script>

0 comments on commit 749e952

Please sign in to comment.