From f39c4fd7590d2f223feb0091a95d7a2a3c8fd23a Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Wed, 1 Jun 2016 18:13:14 +0100
Subject: [PATCH] Update settings to reduce the number of steps needed to set
 up

Update AndroidManifest.xml to target version 23 (for DocumentsContract to work), which means we can elimnate step 13

Update pom.xml to use bytecode version 1.8, so we can eliminate step 12 and 14

Update README.md to reflect these changes
---
 README.md                   | 23 +++++------------------
 commons/AndroidManifest.xml |  2 +-
 pom.xml                     |  6 +++---
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index d7409834b..62f6b7523 100644
--- a/README.md
+++ b/README.md
@@ -42,20 +42,7 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol
     Select ``Next``.
 10. Select ``Next``.
 11. Select ``Finish``.
-12. Use Javac 1.8. To do this, navigate to:  
-    ``File`` > ``Settings`` > ``Build, Execution, Deployment`` > ``Compiler`` > ``Java Compiler``.
-    Then enter these settings:  
-    ``Use compiler: Javac``  
-    ``Project bytecode version (leave blank for JDK default)`` (leave blank)  
-    ``Per-module bytecode versionn`` - for both (``commons`` and ``commons-parent``) remove the preset value. It should change to ``JDK default``.  
-    Select ``OK``.
-13. Reset the SDK. To do this, navigate to:  
-    ``File`` > ``Project Structure`` > ``Project Settings`` > ``Project``.  
-    Set the ``Project SDK`` to ``Maven Android API 23 Platform`` or ``Android API 23 Platform``.  
-14. Set the language levels. On the sidebar go to ``Project Settings`` > ``Modules``.  
-    Select the ``Sources`` tab on the right pane  
-    Go through ``commons``, ``commons-parent``, ``~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0``, and ``~apklib-com.viewpagerindicator_library_2.4.1``. For all of them set ``Language level`` to ``Project default (8 - Lambdas, type annotations etc.)``
-15. Set the Module SDKs.  
+12. Set the Module SDKs.  
     Select the ``Dependencies`` tab on the right pane.  
     Set the modules as follows:  
 
@@ -66,14 +53,14 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol
 	| ~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0 | Maven Android API 14 Platform         |
 	| ~apklib-com.viewpagerindicator_library_2.4.1          | Maven Android API 16 Platform         |
 
-    If these modules are not available, install the correct API levels through the SDK manager. To do this do the following:  
+    If certain modules are not available, install the correct API levels through the SDK manager. To do this do the following:  
     
     * Click ``Cancel``. Navigate to ``File`` > ``Settings`` > ``Appearance & Behaviour`` > ``System Settings`` > ``Android SDK``.  
     * Tick the boxes for API levels ``14``, ``16``, and ``23`` (or Android ``4.0``, ``4.1.2`` and ``6.0``).  
     * Then click ``OK``, and allow it to download the new APIs. Once it has finished, click ``File`` > ``Project Structure`` > ``Project Settings`` > ``Modules``, and repeat step 15.
-16. Select ``commons``. Click the green ``+`` button on the right. Select ``JARs or directories...``. Choose the ``apps-android-commons/lib`` folder. Select ``OK``.
-17. Select ``OK`` to save your changes to the project structre settings.
-18. To test it worked, check if it builds (Select ``commons`` on the projects panel. Select ``Build`` > ``Make Module 'commons'``). If there are no errors (warnings are OK) you're set!
+13. Select ``commons``. Click the green ``+`` button on the right. Select ``JARs or directories...``. Choose the ``apps-android-commons/lib`` folder. Select ``OK``.
+14. Select ``OK`` to save your changes to the project structre settings.
+15. To test it worked, check if it builds (Select ``commons`` on the projects panel. Select ``Build`` > ``Make Module 'commons'``). If there are no errors (warnings are OK) you're set!
 
 ## License ##
 
diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index f14237160..14fcdae32 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="22" />
+        android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
diff --git a/pom.xml b/pom.xml
index 7cf0e0dea..31db9a1b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
                         <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
                         <release>true</release>
                         <sdk>
-                            <platform>22</platform>
+                            <platform>23</platform>
                         </sdk>
                         <sign>
                             <debug>false</debug>
@@ -58,8 +58,8 @@
                     <version>2.3.2</version>
                     <inherited>true</inherited>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.8</source>
+                        <target>1.8</target>
                     </configuration>
                 </plugin>
                 <plugin>