Fix crap

config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:gap="http://phonegap.com/ns/1.0" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.netsyms.terranquest.TerranQuest" version="1.1.2">
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0" id="com.netsyms.terranquest.TerranQuest" version="1.1.2">
     <name>TerranQuest</name>
     <description>
         Augmented Reality fantasy game
@@ -9,22 +9,22 @@
     </author>
     
     <icon src="res/icon.png"/>
-    <preference name="SplashScreen" value="res/splash.9.png" />
+    <preference name="SplashScreen" value="res/splash.9.png"/>
     <preference name="FadeSplashScreen" value="true"/>
     <preference name="FadeSplashScreenDuration" value="2000"/>
-    <preference name="SplashScreenDelay" value="1000" />
+    <preference name="SplashScreenDelay" value="1000"/>
-    <preference name="SplashMaintainAspectRatio" value="false" />
+    <preference name="SplashMaintainAspectRatio" value="false"/>
-    <preference name="SplashShowOnlyFirstTime" value="true" />
+    <preference name="SplashShowOnlyFirstTime" value="true"/>
-    <preference name="AutoHideSplashScreen" value="false" />
+    <preference name="AutoHideSplashScreen" value="false"/>
-    <preference name="ShowSplashScreen" value="true" />
+    <preference name="ShowSplashScreen" value="true"/>
     <platform name="browser">
-        <preference name="ShowSplashScreen" value="false" />
+        <preference name="ShowSplashScreen" value="false"/>
     </platform>
     
     <content src="index.html"/>
     
     <access origin="*"/>
-    <allow-navigation href="*" />
+    <allow-navigation href="*"/>
     <allow-intent href="http://*/*"/>
     <allow-intent href="https://*/*"/>
     <allow-intent href="tel:*"/>

nbproject/build.xml

@@ -226,13 +226,13 @@ made subject to such option by the copyright holder.
         <exec executable="killall" dir="platforms/ios/build">
             <arg value="launchd_sim"/>
         </exec>
-        <exec executable="${ios.sim.exec}" dir="platforms/ios/build" spawn="true">
+        <exec executable="${ios.sim.exec}" dir="platforms/ios/build">
-            <arg line="launch ${project.name}.app ${ios.device.args}"/>
+            <arg line="launch ${project.name}.app ${ios.device.args} --exit"/>
         </exec> 
     </target>
     
     <target name="update-plugins">
-        <!--<plugintask/>-->
+        <plugintask/>
     </target>    
     
     <target name="update-android">
@@ -282,7 +282,9 @@ made subject to such option by the copyright holder.
     </target>
     
     <target name="clean-android" depends="check-android-template" if="android.generated.exists">
-        <ant dir="platforms/android" target="clean"/>
+        <exec executable="./gradlew" dir="platforms/android">
+            <arg value="clean" />
+        </exec>
     </target>
     
     <target name="clean-ios" depends="check-ios-template" if="ios.generated.exists">

nbproject/plugins.properties

@@ -9,16 +9,14 @@
 # For more information about plugins see http://cordova.apache.org/blog/releases/2013/07/23/cordova-3.html
 #
 
-org.apache.cordova.device=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git
+com.phonegap.plugins.barcodescanner=https://github.com/phonegap/phonegap-plugin-barcodescanner.git
-org.apache.cordova.network-information=https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git
+cordova-plugin-whitelist=https://github.com/apache/cordova-plugin-whitelist.git
-org.apache.cordova.device-motion=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion.git
+cordova-plugin-splashscreen=https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git
-org.apache.cordova.device-orientation=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-orientation.git
+cordova-plugin-dialogs=https://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs.git
-org.apache.cordova.geolocation=https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation.git
+cordova-plugin-camera=https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git
-org.apache.cordova.camera=https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git
+cordova-plugin-media=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git
-org.apache.cordova.media-capture=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture.git
+cordova-plugin-media-capture=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture.git
-org.apache.cordova.media=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git
+cordova-plugin-geolocation=https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation.git
-org.apache.cordova.file=https://git-wip-us.apache.org/repos/asf/cordova-plugin-file.git
+cordova-plugin-network-information=https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git
-org.apache.cordova.file-transfer=https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer.git
+cordova-plugin-console=https://git-wip-us.apache.org/repos/asf/cordova-plugin-console.git
-org.apache.cordova.dialogs=https://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs.git
+cordova-plugin-device=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git
-org.apache.cordova.console=https://git-wip-us.apache.org/repos/asf/cordova-plugin-console.git
-com.phonegap.plugins.barcodescanner=https://github.com/phonegap/phonegap-plugin-barcodescanner.git

nbproject/project.properties

@@ -1,4 +1,4 @@
-auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=50
+auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52
 auxiliary.org-netbeans-modules-cordova.phonegap=false
 auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
 file.reference.TerranQuest-test=test

platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties

@@ -1 +1 @@
-#Sat Feb 20 23:05:08 MST 2016
+#Tue Apr 12 16:04:29 MDT 2016

platforms/android/AndroidManifest.xml

@@ -30,12 +30,14 @@
     </application>
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECORD_VIDEO" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
 </manifest>

platforms/android/CordovaLib/build/generated/source/buildConfig/release/org/apache/cordova/BuildConfig.java

@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package org.apache.cordova;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String APPLICATION_ID = "org.apache.cordova";
-  public static final String BUILD_TYPE = "release";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}

platforms/android/CordovaLib/build/intermediates/bundles/release/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.apache.cordova"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="14" />
-
-</manifest>

platforms/android/CordovaLib/build/intermediates/bundles/release/aapt/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.apache.cordova"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="14" />
-
-</manifest>