Skip to content
This repository was archived by the owner on Apr 26, 2022. It is now read-only.

Commit e925714

Browse files
committed
Remove package.json from map app, causing problems
1 parent dc44241 commit e925714

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

Gruntfile.js

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@ module.exports = function(grunt) {
1111
grunt.loadNpmTasks('grunt-contrib-compress');
1212

1313
var appConfig = {
14-
name: require('./package.json').name,
15-
version: require('./package.json').version || '0.0.1',
16-
author: require('./package.json').author,
14+
name: require('./app/package.json').name,
15+
version: require('./app/package.json').version || '0.0.1',
16+
author: require('./app/package.json').author,
1717
};
1818

1919
var common_ignore_dir = [
2020
'/node_modules/grunt($|/)',
21+
'/map/package.json',
22+
'/map/Gruntfile.js',
23+
'.github',
24+
'.git',
25+
'map/contrib',
26+
'map/docs',
27+
'map/Tools',
2128
'.DS_Store',
2229
'.gitignore',
2330
'ngrok-linux'
@@ -34,7 +41,7 @@ module.exports = function(grunt) {
3441

3542
grunt.initConfig({
3643
clean: {
37-
//dist: [path.join(path.resolve(), 'dist')],
44+
osx_dist: [path.join(path.resolve(), 'dist', 'pokemon-go-map-darwin-x64')],
3845
pyc: [path.join(path.resolve(), 'app', '**', '*.pyc')]
3946
},
4047
execute: {
@@ -67,7 +74,7 @@ module.exports = function(grunt) {
6774
iconUrl: 'https://raw.githubusercontent.com/mchristopher/PokemonGo-DesktopMap/master/pokemon.ico',
6875
loadingGif: path.join(path.resolve(), 'installing.gif'),
6976
productName: 'Pokemon GO Live Map',
70-
remoteReleases: 'https://github.com/mchristopher/PokemonGo-DesktopMap/releases/download/v0.2.1'
77+
remoteReleases: 'https://github.com/mchristopher/PokemonGo-DesktopMap/releases/download/v0.3.0'
7178
}
7279
},
7380
'electron': {
@@ -115,13 +122,19 @@ module.exports = function(grunt) {
115122
});
116123

117124
grunt.registerTask('default', [
118-
'clean',
125+
'osx',
126+
'win32'
127+
]);
128+
129+
grunt.registerTask('osx', [
130+
'clean:osx_dist',
131+
'clean:pyc',
119132
'execute',
120133
'electron:macos',
121134
'shell:compressOsx'
122135
]);
123136
grunt.registerTask('win32', [
124-
'clean',
137+
'clean:pyc',
125138
'electron:win32',
126139
'create-windows-installer',
127140
]);

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "Mike Christopher",
55
"repository": "https://github.com/mchristopher/PokemonGo-DesktopMap",
66
"license": "MIT",
7-
"version" : "0.3.0",
7+
"version" : "0.3.1",
88
"main": "main.js",
99
"scripts": {
1010
"start": "electron ."

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "Mike Christopher",
55
"repository": "https://github.com/mchristopher/PokemonGo-DesktopMap",
66
"license": "MIT",
7-
"version" : "0.3.0",
7+
"version" : "99.99.99",
88
"main": "app/main.js",
99
"scripts": {
1010
"postinstall": "cd app && npm install",

0 commit comments

Comments
 (0)