Skip to content

Commit

Permalink
fix(snap): fix snapcraft version check for 3.0
Browse files Browse the repository at this point in the history
Close #3549
  • Loading branch information
develar committed Dec 19, 2018
1 parent 2c674df commit 0ba9c4f
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 109 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"7zip-bin": "~4.1.0",
"@types/is-ci": "^1.1.0",
"app-builder-bin": "2.6.0",
"app-builder-bin": "2.6.1",
"archiver": "^3.0.0",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.6",
Expand Down Expand Up @@ -69,9 +69,9 @@
"yargs": "^12.0.5"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-decorators": "^7.2.0",
"@babel/plugin-proposal-decorators": "^7.2.2",
"@babel/plugin-proposal-do-expressions": "^7.2.0",
"@babel/plugin-proposal-export-default-from": "^7.2.0",
"@babel/plugin-proposal-export-namespace-from": "^7.2.0",
Expand Down Expand Up @@ -115,7 +115,7 @@
"sumchecker": "^2.0.2",
"ts-babel": "6.1.2",
"ts-jsdoc": "^3.0.1",
"tslint": "^5.11.0",
"tslint": "^5.12.0",
"typescript": "~3.2.2",
"whitespace": "^2.1.0",
"worker-farm": "^1.6.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.0",
"app-builder-bin": "2.6.1",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.6",
"chromium-pickle-js": "^0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"out"
],
"dependencies": {
"app-builder-bin": "2.6.0",
"app-builder-bin": "2.6.1",
"temp-file": "^3.3.2",
"fs-extra-p": "^7.0.0",
"is-ci": "^2.0.0",
Expand Down
4 changes: 3 additions & 1 deletion test/src/helpers/packTester.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,9 @@ async function checkMacResult(packager: Packager, packagerOptions: PackagerOptio
delete info.DTSDKBuild
delete info.DTSDKName
delete info.DTCompiler
delete info.NSAllowsArbitraryLoads
if (info.NSAppTransportSecurity != null) {
delete info.NSAppTransportSecurity.NSAllowsArbitraryLoads
}
// test value
if (info.LSMinimumSystemVersion !== "10.12.0") {
delete info.LSMinimumSystemVersion
Expand Down
Loading

0 comments on commit 0ba9c4f

Please sign in to comment.