Merge pull request nostra13#857 from vivekkiran/master

nostra13 · nostra13 · commit 19ce389b7ef6 · 2014-12-26T14:18:52.000+03:00
Target SDK 21
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ language: android
 android:
   components:
     - build-tools-21.1.2
-    - android-16
+    - android-21
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -6,6 +6,6 @@
 
     <uses-sdk
         android:minSdkVersion="5"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
-</manifest>
+</manifest>
diff --git a/library/project.properties b/library/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-21
 android.library=true
diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="5"
-        android:targetSdkVersion="20" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/sample/project.properties b/sample/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-21
