Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-26080] Fix ERR_INVALID_CALLBACK error on Android build and misc Node 10 fixes #10090

Merged
merged 3 commits into from
Jun 12, 2018
Merged

[TIMOB-26080] Fix ERR_INVALID_CALLBACK error on Android build and misc Node 10 fixes #10090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b3d2d9
[TIMOB-26080] Fix ERR_INVALID_CALLBACK error
ewanharris Jun 5, 2018
85111e4
[TIMOB-26081] Fix Buffer deprecation warnings
ewanharris Jun 5, 2018
d485bc6
[TIMOB-25944] Reinstate Node 4 compat
ewanharris Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/cli/commands/_buildModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ AndroidModuleBuilder.prototype.jsToC = function (next) {

if (fs.existsSync(jsBootstrapFile)) {

const str = new Buffer(fs.readFileSync(jsBootstrapFile)); // eslint-disable-line security/detect-new-buffer
const str = Buffer.from(fs.readFileSync(jsBootstrapFile));

[].forEach.call(str, function (char) {
result.push(char);
Expand Down
2 changes: 1 addition & 1 deletion android/cli/hooks/aar-transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class SimpleFileCache {
*/
persist() {
var dataToWrite = JSON.stringify(this.data);
if (!fs.exists(path.dirname(this.cachePathAndFilename))) {
if (!fs.existsSync(path.dirname(this.cachePathAndFilename))) {
wrench.mkdirSyncRecursive(path.dirname(this.cachePathAndFilename));
}
fs.writeFileSync(this.cachePathAndFilename, dataToWrite);
Expand Down
2 changes: 1 addition & 1 deletion android/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"android platform tools": "27.x",
"android tools": "<=26.x",
"android ndk": ">=r11c <=r16c",
"node": ">=4.0 <=7.x",
"node": ">=4.0 <=8.x",
"java": ">=1.8.x"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5480,7 +5480,7 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
const buf = [];
this.pack()
.on('data', function (bytes) {
buf.push(new Buffer(bytes)); // eslint-disable-line security/detect-new-buffer
buf.push(Buffer.from(bytes));
})
.on('end', function (err) {
if (err) {
Expand Down
227 changes: 195 additions & 32 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"lodash.defaultsdeep": "4.6.0",
"markdown": "0.5.0",
"moment": "2.18.1",
"node-appc": "^0.2.45",
"node-appc": "^0.2.47",
"node-titanium-sdk": "^0.4.11",
"node-uuid": "1.4.8",
"pngjs": "3.0.1",
Expand Down