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

Commit

Permalink
Remove package.json from map app, causing problems
Browse files Browse the repository at this point in the history
  • Loading branch information
mchristopher committed Aug 23, 2016
1 parent dc44241 commit e925714
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
27 changes: 20 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,20 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');

var appConfig = {
name: require('./package.json').name,
version: require('./package.json').version || '0.0.1',
author: require('./package.json').author,
name: require('./app/package.json').name,
version: require('./app/package.json').version || '0.0.1',
author: require('./app/package.json').author,
};

var common_ignore_dir = [
'/node_modules/grunt($|/)',
'/map/package.json',
'/map/Gruntfile.js',
'.github',
'.git',
'map/contrib',
'map/docs',
'map/Tools',
'.DS_Store',
'.gitignore',
'ngrok-linux'
Expand All @@ -34,7 +41,7 @@ module.exports = function(grunt) {

grunt.initConfig({
clean: {
//dist: [path.join(path.resolve(), 'dist')],
osx_dist: [path.join(path.resolve(), 'dist', 'pokemon-go-map-darwin-x64')],
pyc: [path.join(path.resolve(), 'app', '**', '*.pyc')]
},
execute: {
Expand Down Expand Up @@ -67,7 +74,7 @@ module.exports = function(grunt) {
iconUrl: 'https://raw.githubusercontent.com/mchristopher/PokemonGo-DesktopMap/master/pokemon.ico',
loadingGif: path.join(path.resolve(), 'installing.gif'),
productName: 'Pokemon GO Live Map',
remoteReleases: 'https://github.com/mchristopher/PokemonGo-DesktopMap/releases/download/v0.2.1'
remoteReleases: 'https://github.com/mchristopher/PokemonGo-DesktopMap/releases/download/v0.3.0'
}
},
'electron': {
Expand Down Expand Up @@ -115,13 +122,19 @@ module.exports = function(grunt) {
});

grunt.registerTask('default', [
'clean',
'osx',
'win32'
]);

grunt.registerTask('osx', [
'clean:osx_dist',
'clean:pyc',
'execute',
'electron:macos',
'shell:compressOsx'
]);
grunt.registerTask('win32', [
'clean',
'clean:pyc',
'electron:win32',
'create-windows-installer',
]);
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Mike Christopher",
"repository": "https://github.com/mchristopher/PokemonGo-DesktopMap",
"license": "MIT",
"version" : "0.3.0",
"version" : "0.3.1",
"main": "main.js",
"scripts": {
"start": "electron ."
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Mike Christopher",
"repository": "https://github.com/mchristopher/PokemonGo-DesktopMap",
"license": "MIT",
"version" : "0.3.0",
"version" : "99.99.99",
"main": "app/main.js",
"scripts": {
"postinstall": "cd app && npm install",
Expand Down

0 comments on commit e925714

Please sign in to comment.