diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-22 16:08:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 16:08:08 -0700 |
| commit | 61d87976e8b29ed25061ae98743a6cf4f4274542 (patch) | |
| tree | fa4d9bca5fe1b9478ba2f1cc1e6c7d8d18bf15ce /android-lib.gradle | |
| parent | 8f2b5ac043f47cc44f43c3788d1377083fb339a2 (diff) | |
| download | kau-61d87976e8b29ed25061ae98743a6cf4f4274542.tar.gz kau-61d87976e8b29ed25061ae98743a6cf4f4274542.tar.bz2 kau-61d87976e8b29ed25061ae98743a6cf4f4274542.zip | |
Support sdk 19 where possible and add image picker (#10)3.0
* Fix plural
* Switch to long
* Test plural again
* Comment
* Major update to image picker and view utils
* Make image activity full screen
* Update min sdk and prefix
* Lower sdk requirement and make string private
* Bring kpref activity to sdk 19
Diffstat (limited to 'android-lib.gradle')
| -rw-r--r-- | android-lib.gradle | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/android-lib.gradle b/android-lib.gradle index 7eb6a79..78526e5 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -14,8 +14,18 @@ android { compileSdkVersion Integer.parseInt(project.TARGET_SDK) buildToolsVersion project.BUILD_TOOLS + def kauMinSdk = project.MIN_SDK + if (project.hasProperty('kauSubModuleMinSdk')) + kauMinSdk = kauSubModuleMinSdk + + def kauResourcePrefix = "kau_" + if (project.hasProperty('kauSubModuleResourcePrefix')) + kauResourcePrefix = kauSubModuleResourcePrefix + + resourcePrefix kauResourcePrefix + defaultConfig { - minSdkVersion Integer.parseInt(project.MIN_SDK) + minSdkVersion Integer.parseInt(kauMinSdk) targetSdkVersion Integer.parseInt(project.TARGET_SDK) consumerProguardFiles 'progress-proguard.txt' testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -42,5 +52,6 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' + main.res.srcDirs += 'src/main/res-public' } }
\ No newline at end of file |