Skip to content

Commit f39c4fd

Browse files
committed
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
1 parent 57ff042 commit f39c4fd

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

README.md

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,7 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol
4242
Select ``Next``.
4343
10. Select ``Next``.
4444
11. Select ``Finish``.
45-
12. Use Javac 1.8. To do this, navigate to:
46-
``File`` > ``Settings`` > ``Build, Execution, Deployment`` > ``Compiler`` > ``Java Compiler``.
47-
Then enter these settings:
48-
``Use compiler: Javac``
49-
``Project bytecode version (leave blank for JDK default)`` (leave blank)
50-
``Per-module bytecode versionn`` - for both (``commons`` and ``commons-parent``) remove the preset value. It should change to ``JDK default``.
51-
Select ``OK``.
52-
13. Reset the SDK. To do this, navigate to:
53-
``File`` > ``Project Structure`` > ``Project Settings`` > ``Project``.
54-
Set the ``Project SDK`` to ``Maven Android API 23 Platform`` or ``Android API 23 Platform``.
55-
14. Set the language levels. On the sidebar go to ``Project Settings`` > ``Modules``.
56-
Select the ``Sources`` tab on the right pane
57-
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.)``
58-
15. Set the Module SDKs.
45+
12. Set the Module SDKs.
5946
Select the ``Dependencies`` tab on the right pane.
6047
Set the modules as follows:
6148

@@ -66,14 +53,14 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol
6653
| ~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0 | Maven Android API 14 Platform |
6754
| ~apklib-com.viewpagerindicator_library_2.4.1 | Maven Android API 16 Platform |
6855

69-
If these modules are not available, install the correct API levels through the SDK manager. To do this do the following:
56+
If certain modules are not available, install the correct API levels through the SDK manager. To do this do the following:
7057

7158
* Click ``Cancel``. Navigate to ``File`` > ``Settings`` > ``Appearance & Behaviour`` > ``System Settings`` > ``Android SDK``.
7259
* Tick the boxes for API levels ``14``, ``16``, and ``23`` (or Android ``4.0``, ``4.1.2`` and ``6.0``).
7360
* 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.
74-
16. Select ``commons``. Click the green ``+`` button on the right. Select ``JARs or directories...``. Choose the ``apps-android-commons/lib`` folder. Select ``OK``.
75-
17. Select ``OK`` to save your changes to the project structre settings.
76-
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!
61+
13. Select ``commons``. Click the green ``+`` button on the right. Select ``JARs or directories...``. Choose the ``apps-android-commons/lib`` folder. Select ``OK``.
62+
14. Select ``OK`` to save your changes to the project structre settings.
63+
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!
7764

7865
## License ##
7966

commons/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="9"
8-
android:targetSdkVersion="22" />
8+
android:targetSdkVersion="23" />
99

1010
<uses-permission android:name="android.permission.INTERNET" />
1111
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
4646
<release>true</release>
4747
<sdk>
48-
<platform>22</platform>
48+
<platform>23</platform>
4949
</sdk>
5050
<sign>
5151
<debug>false</debug>
@@ -58,8 +58,8 @@
5858
<version>2.3.2</version>
5959
<inherited>true</inherited>
6060
<configuration>
61-
<source>1.5</source>
62-
<target>1.5</target>
61+
<source>1.8</source>
62+
<target>1.8</target>
6363
</configuration>
6464
</plugin>
6565
<plugin>

0 commit comments

Comments
 (0)