From 02cd07ee21eae79241329d7b736ce21e7b251b40 Mon Sep 17 00:00:00 2001 From: valeriej Date: Wed, 1 May 2013 22:25:47 -0500 Subject: [PATCH 1/6] Add instructions on how to set up IntelliJ in README --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.md b/README.md index 09a006e73..58c122bb7 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,30 @@ **Note**: Currently uses a bunch of dependencies that are staged at `yuvi.in/blog/maven`. Will be migrated to either [Maven Central][4] or a Wikimedia staging server soon. +## Set Up IntelliJ for Commons App Development ## + +### Import and Compile CommonApp ## + +[Download IntelliJ] [6] + +1. Clone the repository. +2. Open IntelliJ. +3. Import Project: + File -> Import Project + or + Select 'Import Project' from the Quick Start menu +4. Navigate to the folder with the cloned repository and press 'OK'. +5. Select 'Import Project from external model' -> 'Maven' and press 'Next'. +6. Make sure 'Search for projects recursively' and 'Import Maven projects automatically' are checked. Select 'Next'. +7. This section needs no modification. Select 'Next'. +8. This section needs no modification. Select 'Next'. +9. Make sure the 'Android SDK home path' points to the 'android-sdk' folder. If the dropdown next to 'Java SDK' is empty, hit the '+' button avobe the sidebar and select 'JDK'. Navigate to your jdk folder, select it, and hit 'OK'. Now select the newly added JDK and hit 'Next'. +10. This section needs no modifications. Select 'Next'. +11. Select 'Finish'. +12. After the program opens select 'Make project' - there should be errors. +13. Neat the top of the file that is opened up, one of the offending lines should be "import android.support.v4.app.FragmentActivity;" - put your cursor on that line and hit 'alt'/'option'+'enter' to bring up the AutoFix dialog. Select the 'compatibility' option. +14. Select 'Make project' again. It should compile successfully. + ## License ## This software is licensed under the [Apache License][5]. From e1e3aed17fd3581bf79b91fde8d9e645961adcf9 Mon Sep 17 00:00:00 2001 From: valeriej Date: Wed, 1 May 2013 22:31:36 -0500 Subject: [PATCH 2/6] Fixed format to fix link in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 58c122bb7..41f88d9fb 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ### Import and Compile CommonApp ## -[Download IntelliJ] [6] +[Download IntelliJ][6] 1. Clone the repository. 2. Open IntelliJ. From 83a70d1c202fa9488aebb37cf080c1ca3e2f2f19 Mon Sep 17 00:00:00 2001 From: valeriej Date: Wed, 1 May 2013 22:40:00 -0500 Subject: [PATCH 3/6] Adding line breaks to IntelliJ set up --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 41f88d9fb..8125ed38e 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ 1. Clone the repository. 2. Open IntelliJ. -3. Import Project: - File -> Import Project - or - Select 'Import Project' from the Quick Start menu +3. Import Project: + File -> Import Project + or + Select 'Import Project' from the Quick Start menu 4. Navigate to the folder with the cloned repository and press 'OK'. 5. Select 'Import Project from external model' -> 'Maven' and press 'Next'. 6. Make sure 'Search for projects recursively' and 'Import Maven projects automatically' are checked. Select 'Next'. From 300218abc91219a2cc2e6e3e8f304c418d5e30e4 Mon Sep 17 00:00:00 2001 From: valeriej Date: Wed, 1 May 2013 22:47:22 -0500 Subject: [PATCH 4/6] Fixed typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8125ed38e..29a163a21 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ **Note**: Currently uses a bunch of dependencies that are staged at `yuvi.in/blog/maven`. Will be migrated to either [Maven Central][4] or a Wikimedia staging server soon. -## Set Up IntelliJ for Commons App Development ## +## Set Up IntelliJ for Commons Android App Development ## -### Import and Compile CommonApp ## +### Import and Compile Commons Android App ## [Download IntelliJ][6] From 51a63c3f97c0c20ab16db2530a5d240a04abd5b0 Mon Sep 17 00:00:00 2001 From: valeriej Date: Wed, 1 May 2013 22:56:03 -0500 Subject: [PATCH 5/6] Fix link to IntelliJ download --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 29a163a21..1fd8cab2b 100644 --- a/README.md +++ b/README.md @@ -51,3 +51,4 @@ This software has no bugs. You can dispute this statement at [bugzilla][3] [3]: https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App [4]: http://search.maven.org/ [5]: https://www.apache.org/licenses/LICENSE-2.0 +[6]: httpK//www.jetbrains.com/idea/download/index.html From b5f25be7f513799c14094bc8272d0df44d88ffed Mon Sep 17 00:00:00 2001 From: valeriej Date: Thu, 2 May 2013 12:08:08 -0500 Subject: [PATCH 6/6] Fix typos in instructions and link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fd8cab2b..6d17b8153 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ 10. This section needs no modifications. Select 'Next'. 11. Select 'Finish'. 12. After the program opens select 'Make project' - there should be errors. -13. Neat the top of the file that is opened up, one of the offending lines should be "import android.support.v4.app.FragmentActivity;" - put your cursor on that line and hit 'alt'/'option'+'enter' to bring up the AutoFix dialog. Select the 'compatibility' option. +13. Near the top of the file that is opened up, one of the offending lines should be "import android.support.v4.app.FragmentActivity;" - put your cursor on that line and hit 'alt'/'option'+'enter' to bring up the AutoFix dialog. Select the 'compatibility' option. 14. Select 'Make project' again. It should compile successfully. ## License ## @@ -51,4 +51,4 @@ This software has no bugs. You can dispute this statement at [bugzilla][3] [3]: https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App [4]: http://search.maven.org/ [5]: https://www.apache.org/licenses/LICENSE-2.0 -[6]: httpK//www.jetbrains.com/idea/download/index.html +[6]: http://www.jetbrains.com/idea/download/index.html