From 2305e20ed3fc793b73fe84a74c42eb0ca3bed62a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 15 Jan 2018 22:13:06 -0500 Subject: [PATCH] safari version and gulp filtering --- gulpfile.js | 11 ++++++----- src/Info.plist | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 580bb7b86a..f93804438c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -27,12 +27,13 @@ const filters = { 'build/popup/fonts/fontawesome*.woff' ], safari: [ - '!build/Info.plist' + '!build/Info.plist', + '!build/downloader/**/*' ], - notSafari: [ + webExt: [ '!build/manifest.json' ], - notEdge: [ + edge: [ '!build/edge/**/*' ] }; @@ -51,7 +52,7 @@ function distFileName(browserName, ext) { function dist(browserName, manifest) { return gulp.src(paths.build + '**/*') - .pipe(filter(['**'].concat(filters.notEdge).concat(filters.fonts).concat(filters.safari))) + .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.safari))) .pipe(gulpif('popup/index.html', replace('__BROWSER__', browserName))) .pipe(gulpif('manifest.json', jeditor(manifest))) .pipe(zip(distFileName(browserName, 'zip'))) @@ -175,7 +176,7 @@ function safariMoveBuild(source, dest) { return new Promise((resolve, reject) => { gulp.src(source) .on('error', reject) - .pipe(filter(['**'].concat(filters.notEdge).concat(filters.fonts).concat(filters.notSafari))) + .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.webExt))) .pipe(gulp.dest(dest)) .on('end', resolve); }); diff --git a/src/Info.plist b/src/Info.plist index 1d10b11605..9ab9ce6718 100644 --- a/src/Info.plist +++ b/src/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleShortVersionString - 1.0 + 1.23.0 CFBundleVersion 1 Chrome