updated bower components and fixed bug with building an android app #174

Author: wwebfor

.gitignore

@@ -20,6 +20,8 @@ test/visual/screenshots
 #########################
 platforms
 phonegap
+releases
+.cordova
 
 # Compiled source #
 ###################

Gruntfile.js

@@ -33,7 +33,7 @@ module.exports = function (grunt) {
 			root: '<%= yeoman.dist %>',
 			// config: 'config.xml',
             config: {
-                template: 'config.xml',
+                template: '<%= yeoman.dist %>/config.xml',
                 data: {
                     id: 'org.phonegap.laverna',
                     version: pkg.version,
@@ -48,14 +48,6 @@ module.exports = function (grunt) {
             releases: 'releases',
             releaseName: function () {
                 return (pkg.name + '-' + pkg.version);
-            },
-            icons: {
-                android: {
-                    ldpi  : 'phonegap/www/images/icon/icon-32x32.png',
-                    mdpi  : 'phonegap/www/images/icon/icon-48x48.png',
-                    hdpi  : 'phonegap/www/images/icon/icon-64x64.png',
-                    xhdpi : 'phonegap/www/images/icon/icon-90x90.png'
-                }
             }
 		}
     };
@@ -328,6 +320,7 @@ module.exports = function (grunt) {
                         '.htaccess',
                         'images/{,*/}*.{webp,gif,png}',
                         'font/*',
+                        'config.xml',
                         'locales/*/*',
                         'docs/*.md'
                     ]
@@ -351,8 +344,8 @@ module.exports = function (grunt) {
                         'bower_components/MathJax/extensions/**',
                         'bower_components/MathJax/fonts/HTML-CSS/TeX/woff/**',
                         'bower_components/MathJax/jax/element/**',
-                        'bower_components/MathJax/jax/input/{MathML,TeX}/**',
-                        'bower_components/MathJax/jax/output/{HTML-CSS,NativeMML}/**',
+                        'bower_components/MathJax/jax/input/{MathML,TeX}/{,**/}*',
+                        'bower_components/MathJax/jax/output/{HTML-CSS,NativeMML}/{,*/,***/}*',
                         'bower_components/MathJax/localization/en/**'
                     ]
                 }]

app/config.xml

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="<%= id %>" version="<%= version %>" xmlns="http://www.w3.org/ns/widgets" xmlns:gap="http://phonegap.com/ns/1.0">
+    <name>Laverna</name>
+    <description>
+        Open source note taking application
+    </description>
+    <author email="[email protected]" href="https://github.com/Laverna/laverna">
+        Laverna project
+    </author>
+    <feature name="http://api.phonegap.com/1.0/device" />
+    <preference name="permissions" value="none" />
+    <preference name="orientation" value="default" />
+    <preference name="target-device" value="universal" />
+    <preference name="fullscreen" value="true" />
+    <preference name="webviewbounce" value="true" />
+    <preference name="prerendered-icon" value="true" />
+    <preference name="stay-in-webview" value="false" />
+    <preference name="ios-statusbarstyle" value="black-opaque" />
+    <preference name="detect-data-types" value="true" />
+    <preference name="exit-on-suspend" value="false" />
+    <preference name="show-splash-screen-spinner" value="true" />
+    <preference name="auto-hide-splash-screen" value="true" />
+    <preference name="disable-cursor" value="false" />
+    <preference name="android-minSdkVersion" value="7" />
+    <preference name="android-installLocation" value="auto" />
+    <icon src="www/images/icon/icon.png" />
+    <icon gap:density="ldpi" gap:platform="android" src="www/images/icon/icon-36x36.png" />
+    <icon gap:density="mdpi" gap:platform="android" src="www/images/icon/icon-48x48.png" />
+    <icon gap:density="hdpi" gap:platform="android" src="www/images/icon/icon-72x72.png" />
+    <icon gap:density="xhdpi" gap:platform="android" src="www/images/icon/icon-96x96.png" />
+    <access origin="http://127.0.0.1*" />
+</widget>

bower.json

@@ -4,27 +4,27 @@
   "dependencies": {
     "requirejs": "~2.1.11",
     "requirejs-text": "~2.0.10",
-    "modernizr": "~2.7.1",
-    "jquery": "~1.10.2",
-    "underscore": "~1.6.0",
+    "modernizr": "~2.8.3",
+    "jquery": "~1.11.1",
+    "underscore": "~1.7.0",
     "backbone": "~1.1.2",
-    "marionette": "~2.0.1",
+    "marionette": "~2.2.1",
     "backbone.babysitter": "~0.1.4",
     "backbone.wreqr": "~1.3.1",
     "backbone.localStorage": "~1.1.7",
     "indexeddb-backbonejs-adapter": "git://github.com/superfeedr/indexeddb-backbonejs-adapter.git#master",
     "IndexedDBShim": "git://github.com/axemclion/IndexedDBShim.git#e5961318d9c49b877ed181c7b639cbe9302c3e6d",
     "mousetrap": "~1.4.6",
     "backbone.mousetrap": "git://github.com/elasticsales/backbone.mousetrap.git#11ecdbfbe1099249daa6e1e86db7aee090ea5801",
-    "ace": "#fbc546032090752664aaea13c8f9489dea43490a",
+    "ace": "#79eda6d2a8c4f788530cb5e6b238af67bfcc609d",
     "pagedown-ace": "git://github.com/benweet/pagedown-ace.git#84d5e1b7ff233a1c8cafa9716e825228d275120c",
     "pagedown-extra": "git://github.com/jmcmanus/pagedown-extra.git#bd0870e3e871e15bde1fa5a427e3e10028a09789",
     "google-code-prettify": "master",
     "sjcl": "~1.0.0",
     "to-markdown": "#jquery",
     "i18next": "~1.7.2",
     "device.js": "git://github.com/matthewhudson/device.js",
-    "dropzone": "git://github.com/enyo/dropzone#~3.8.4",
+    "dropzone": "~3.10.2",
     "blueimp-canvas-to-blob": "git://github.com/blueimp/JavaScript-Canvas-to-Blob#~2.1.0",
     "hammerjs": "~2.0.1",
     "bootstrap": "~3.2.0",
@@ -33,7 +33,7 @@
     "remotestorage.js": "git://github.com/remotestorage/remotestorage.js.git#0.10.0-beta3",
     "FileSaver": "*",
     "Blob": "git://github.com/eligrey/Blob.js",
-    "MathJax": "v2.2",
+    "MathJax": "~2.4.0",
     "xregexp": "~2.0.0"
   },
   "devDependencies": {}