aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-13 19:05:26 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-13 19:05:26 +0100
commit2f0eb3fbd644291272829c15165193e0edb0906f (patch)
tree806063501b3ae0c844a6a38ae330830b0fa5cf1f
parent01c3e7bbf98eead137f4c065c7108811d8f1be52 (diff)
downloadopen-keychain-2f0eb3fbd644291272829c15165193e0edb0906f.tar.gz
open-keychain-2f0eb3fbd644291272829c15165193e0edb0906f.tar.bz2
open-keychain-2f0eb3fbd644291272829c15165193e0edb0906f.zip
Set minSdk to 14
-rw-r--r--OpenKeychain/build.gradle6
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml5
m---------extern/openpgp-api-lib0
3 files changed, 4 insertions, 7 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index ff3a63fd7..1c3fed303 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
- compile 'com.android.support:support-v4:21.0.2'
- compile 'com.android.support:appcompat-v7:21.0.2'
+ compile 'com.android.support:support-v4:21.0.3'
+ compile 'com.android.support:appcompat-v7:21.0.3'
compile project(':extern:openpgp-api-lib')
compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview')
@@ -28,7 +28,7 @@ android {
buildToolsVersion '21.1.1'
defaultConfig {
- minSdkVersion 9
+ minSdkVersion 14
targetSdkVersion 21
}
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 9fc79e6f1..ab6c4334b 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -31,10 +31,7 @@
For OI Filemanager it makes no difference, gpg files can't be associated
-->
- <!-- Specified in build.gradle -->
- <!--<uses-sdk-->
- <!--android:minSdkVersion="9"-->
- <!--android:targetSdkVersion="19" />-->
+ <!-- SDK levels are specified in build.gradle -->
<uses-feature
android:name="android.hardware.wifi"
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
-Subproject 89b0a3bd140dd178595c031beaa27747575d7ac
+Subproject 76d7b17f114ef180fdbe6852d8897e8b9a4bca8