Upgraded structure of repository to match latest Android conventions

Upgraded android-maven-plugin to 4.1.1
Upgraded minimum maven version required to 1.1.1
Enabled Spoon testrunner during integration-test phase of build

README.md

@@ -21,7 +21,7 @@ There are different ways to get the Gnucash app for Android; through the app sto
 ## Building
 
 The build requires [Maven](http://maven.apache.org/download.html)
-v3.0.3+ and the [Android SDK](http://developer.android.com/sdk/index.html)
+v3.1.1+ and the [Android SDK](http://developer.android.com/sdk/index.html)
 to be installed in your development environment. In addition you'll need to set
 the `ANDROID_HOME` environment variable to the location of your SDK:
 
@@ -51,7 +51,7 @@ You could as well contribute code, fixing bugs, new features or automated tests.
 Take a look at the [bug tracker](https://github.com/codinguser/gnucash-android/issues?state=open)
 for ideas where to start.
 
-For development, it is recommended to use the IntelliJ IDEA 13+ IDE for development which is available as free
+For development, it is recommended to use the IntelliJ IDEA 14+ IDE for development which is available as free
 community edition. Import the project into the IDE from an external (maven) model.The IDE will resolve dependencies automatically.
 
 #Licence

app/pom.xml

@@ -53,10 +53,9 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
             </plugin>
         </plugins>

app/AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2012 Ngewi Fet <ngewif@gmail.com>
- 
- Licensed 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.gnucash.android"
-    android:versionCode="46"
-    android:versionName="@string/app_version_name" >
-
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
-
-    <permission-group 
-        android:name="org.gnucash.android.permission.group.GNUCASH"
-        android:label="@string/label_permission_group" 
-        android:description="@string/description_permission_group" />
-
-    <permission android:name="org.gnucash.android.permission.CREATE_ACCOUNT" 
-        android:label="@string/label_permission_create_account"
-        android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
-        android:protectionLevel="dangerous" />
-    <permission android:name="org.gnucash.android.permission.RECORD_TRANSACTION" 
-        android:label="@string/label_permission_record_transaction"
-        android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
-        android:protectionLevel="dangerous" />
-
-    <uses-permission android:label="@string/label_permission_record_transactions"
-        android:name="org.gnucash.android.permission.RECORD_TRANSACTION" />
-    <uses-permission android:label="@string/label_permission_create_accounts"
-        android:name="org.gnucash.android.permission.CREATE_ACCOUNT" />
-    <uses-permission android:label="@string/permission_access_sdcard"
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application android:name="org.gnucash.android.app.GnuCashApplication"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" 
-        android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
-        <activity
-            android:name=".ui.account.AccountsActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.passcode.PasscodeLockScreenActivity"
-            android:noHistory="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-        <activity android:name=".ui.settings.SettingsActivity"/>
-        <activity android:name=".ui.passcode.PasscodePreferenceActivity" />
-        <activity android:name=".ui.transaction.TransactionsActivity"
-            android:configChanges="orientation|screenSize">
-        </activity>
-        <activity android:name=".ui.widget.WidgetConfigurationActivity"
-            android:label="@string/label_widget_configuration"
-            android:theme="@style/Dialog.WidgetConfiguration"
-            android:excludeFromRecents="true">
-		    <intent-filter>
-		        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-		    </intent-filter>
-		</activity>
-        <receiver android:name=".receivers.TransactionRecorder"
-            android:label="Records transactions received through intents"
-            android:permission="org.gnucash.android.permission.RECORD_TRANSACTION">
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.transaction"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.AccountCreator"
-            android:label="Creates new accounts"
-            android:permission="org.gnucash.android.permission.CREATE_ACCOUNT" 
-            android:enabled="true" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.account"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.TransactionAppWidgetProvider" >
-		    <intent-filter>
-		        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-		    </intent-filter>
-		    <meta-data android:name="android.appwidget.provider"
-		               android:resource="@xml/transaction_appwidget_info" />
-		</receiver>
-
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2012 Ngewi Fet <ngewif@gmail.com>
+ 
+ Licensed 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.gnucash.android"
+    android:versionCode="46"
+    android:versionName="@string/app_version_name" >
+
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
+
+    <permission-group 
+        android:name="org.gnucash.android.permission.group.GNUCASH"
+        android:label="@string/label_permission_group" 
+        android:description="@string/description_permission_group" />
+
+    <permission android:name="org.gnucash.android.permission.CREATE_ACCOUNT" 
+        android:label="@string/label_permission_create_account"
+        android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
+        android:protectionLevel="dangerous" />
+    <permission android:name="org.gnucash.android.permission.RECORD_TRANSACTION" 
+        android:label="@string/label_permission_record_transaction"
+        android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
+        android:protectionLevel="dangerous" />
+
+    <uses-permission android:label="@string/label_permission_record_transactions"
+        android:name="org.gnucash.android.permission.RECORD_TRANSACTION" />
+    <uses-permission android:label="@string/label_permission_create_accounts"
+        android:name="org.gnucash.android.permission.CREATE_ACCOUNT" />
+    <uses-permission android:label="@string/permission_access_sdcard"
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <application android:name="org.gnucash.android.app.GnuCashApplication"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" 
+        android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
+        <activity
+            android:name=".ui.account.AccountsActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.passcode.PasscodeLockScreenActivity"
+            android:noHistory="true"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+        <activity android:name=".ui.settings.SettingsActivity"/>
+        <activity android:name=".ui.passcode.PasscodePreferenceActivity" />
+        <activity android:name=".ui.transaction.TransactionsActivity"
+            android:configChanges="orientation|screenSize">
+        </activity>
+        <activity android:name=".ui.widget.WidgetConfigurationActivity"
+            android:label="@string/label_widget_configuration"
+            android:theme="@style/Dialog.WidgetConfiguration"
+            android:excludeFromRecents="true">
+		    <intent-filter>
+		        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+		    </intent-filter>
+		</activity>
+        <receiver android:name=".receivers.TransactionRecorder"
+            android:label="Records transactions received through intents"
+            android:permission="org.gnucash.android.permission.RECORD_TRANSACTION">
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.transaction"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receivers.AccountCreator"
+            android:label="Creates new accounts"
+            android:permission="org.gnucash.android.permission.CREATE_ACCOUNT" 
+            android:enabled="true" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.account"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receivers.TransactionAppWidgetProvider" >
+		    <intent-filter>
+		        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+		    </intent-filter>
+		    <meta-data android:name="android.appwidget.provider"
+		               android:resource="@xml/transaction_appwidget_info" />
+		</receiver>
+
+    </application>
+
 </manifest>