diff options
author | Arne Schwabe <arne@rfc2549.org> | 2016-05-22 10:06:02 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2016-05-22 10:06:02 +0200 |
commit | b4c4cf706ecb2f66c87113c2472ce2790404670f (patch) | |
tree | 4743fc86c8f4f4c612101375da9f9f81d93b08a3 /main/build.gradle | |
parent | 1df79a1ff67a3388a26e9acd62c97639abbdc267 (diff) | |
parent | 727fed99d567002a33c4b8e315b0677751a3e283 (diff) |
Merge branch 'master' into androidN
Diffstat (limited to 'main/build.gradle')
-rw-r--r-- | main/build.gradle | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/build.gradle b/main/build.gradle index 41cf114f..0dd71338 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -26,10 +26,10 @@ android { buildToolsVersion '24.0.0-rc1' defaultConfig { - minSdkVersion 14 + minSdkVersion 'N' targetSdkVersion 'N' - versionCode = 132 - versionName = "0.6.52" + versionCode = 136 + versionName = "0.6.55" } sourceSets { @@ -80,7 +80,9 @@ android { normal - + modern { + minSdkVersion 21 + } /* x86 { versionCode Integer.parseInt("6" + defaultConfig.versionCode) |