From: Luke Owncloud <owncloud@ohrt.org>
Date: Thu, 30 Jan 2014 07:51:07 +0000 (+0100)
Subject: changed name of oc_framework to android-library in setup.md and pom.xml
X-Git-Tag: oc-android-1.5.5~50^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/32cf40d66f37b5854505b4fe9fb24ff89c51b298

changed name of oc_framework to android-library in setup.md and pom.xml
updated Android API in pom.xml
---

diff --git a/SETUP.md b/SETUP.md
index 13c4f592..12db83dc 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -27,13 +27,13 @@ NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in
 
 NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed.
 
-Download/install Android plugin for Maven, install oc_framework, then build ownCloud with mvn:
+Download/install Android plugin for Maven, install owncloud-android-library, then build ownCloud with mvn:
 
 * cd ..
 * git clone https://github.com/mosabua/maven-android-sdk-deployer.git
 * cd maven-android-sdk-deployer
 * mvn -pl com.simpligility.android.sdk-deployer:android-19 -am install
-* cd ../android/oc_framework
+* cd ../android/owncloud-android-library
 * mvn install
 * cd ..
 
@@ -48,15 +48,15 @@ NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in
 * Clean project and compile.
 * If any error appear, check the project properties; in the 'Android' section, API Level should be greater or equal than 14.
 * Make sure android/actionbarsherlock/library/bin/library.jar was created.
-* Create a new "Android Project from Existing Code". Choose android/oc_framework as root.
+* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root.
 * Clean project and compile.
 * If any error appear, check the project properties; in the 'Android' section, API Level should be 19 or greater.
-* Make sure android/oc_framework/bin/classes.jar was created.  
+* Make sure android/owncloud-android-library/bin/classes.jar was created.  
 * Import ownCloud Android project.
 * Clean project and compile.
 * If any error appears, check the project properties of owncloud-android project; in the 'Android' section:
   - API Level should be 19 or greater.
-  - Two library projects should appear referred in the bottom square: actionbarsherlock/library and oc_framework. Add them if needed. 
+  - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. 
 * After those actions you should be good to go. HAVE FUN!
 
 NOTE: Even though API level is set to 19, APK also runs on older devices because in AndroidManifest.xml minSdkVersion is set to 8.
diff --git a/pom.xml b/pom.xml
index 5e7c1ea3..15bd0b68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
         <java-version>1.6</java-version>
         <!-- Given by maven-android-sdk-deployer -->
-        <google.android-version>4.4_r1</google.android-version>
+        <google.android-version>4.4.2_r2</google.android-version>
         <!-- Usually the latest Android API -->
         <google.android-api>19</google.android-api>
         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
@@ -50,10 +50,10 @@
             <type>apklib</type>
         </dependency>
 
-        <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
+        <!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->
         <dependency>
          <groupId>com.owncloud.android</groupId>
-         <artifactId>oc_framework</artifactId>
+         <artifactId>owncloud-android-library</artifactId>
          <version>${owncloud.version}</version>
       </dependency>