Merge branch 'upgrade' of https://github.com/zhuangya/node-xcode into zhuangya-upgrade
diff --git a/package.json b/package.json
index bf02d90..d8ec61a 100644
--- a/package.json
+++ b/package.json
@@ -11,15 +11,15 @@
"node": ">=0.6.7"
},
"dependencies": {
- "pegjs": "0.9.0",
- "simple-plist": "0.1.4",
- "uuid":"3.0.1"
+ "pegjs": "^0.10.0",
+ "simple-plist": "^0.2.1",
+ "uuid": "3.0.1"
},
"devDependencies": {
- "nodeunit": "0.9.1"
+ "nodeunit": "^0.11.0"
},
"scripts": {
"test": "node_modules/.bin/nodeunit test/parser test"
- },
+ },
"license": "Apache-2.0"
}
diff --git a/test/parser/build-config.js b/test/parser/build-config.js
index 20eb5cf..fa7e52c 100644
--- a/test/parser/build-config.js
+++ b/test/parser/build-config.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/build-config.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
util = require('util'),
project = rawProj.project;
diff --git a/test/parser/comments.js b/test/parser/comments.js
index c44727c..a97c6c3 100644
--- a/test/parser/comments.js
+++ b/test/parser/comments.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/comments.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar);
+ parser = PEG.generate(grammar);
// Cordova 1.8 has the Apache headers as comments in the pbxproj file
// I DON'T KNOW WHY
diff --git a/test/parser/dotsInNames.js b/test/parser/dotsInNames.js
index 212b178..f5c0070 100644
--- a/test/parser/dotsInNames.js
+++ b/test/parser/dotsInNames.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/dots-in-names.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/file-references.js b/test/parser/file-references.js
index b77a798..53f1ce3 100644
--- a/test/parser/file-references.js
+++ b/test/parser/file-references.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/file-references.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/hash.js b/test/parser/hash.js
index 9cdad4f..c64c829 100644
--- a/test/parser/hash.js
+++ b/test/parser/hash.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/hash.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/header-search.js b/test/parser/header-search.js
index 0f34adc..5bf27fa 100644
--- a/test/parser/header-search.js
+++ b/test/parser/header-search.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/header-search.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/section-entries.js b/test/parser/section-entries.js
index 7c54fef..86fc506 100644
--- a/test/parser/section-entries.js
+++ b/test/parser/section-entries.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/section-entries.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/section-split.js b/test/parser/section-split.js
index ea6bf1d..aa6ebdd 100644
--- a/test/parser/section-split.js
+++ b/test/parser/section-split.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/section-split.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/section.js b/test/parser/section.js
index afe6f61..a49474d 100644
--- a/test/parser/section.js
+++ b/test/parser/section.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/section.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/two-sections.js b/test/parser/two-sections.js
index 863f5f6..bdc9484 100644
--- a/test/parser/two-sections.js
+++ b/test/parser/two-sections.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/two-sections.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
diff --git a/test/parser/with_array.js b/test/parser/with_array.js
index 0ff1e1d..c9c4f3d 100644
--- a/test/parser/with_array.js
+++ b/test/parser/with_array.js
@@ -2,7 +2,7 @@
fs = require('fs'),
pbx = fs.readFileSync('test/parser/projects/with_array.pbxproj', 'utf-8'),
grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
- parser = PEG.buildParser(grammar),
+ parser = PEG.generate(grammar),
rawProj = parser.parse(pbx),
project = rawProj.project;
