Commit 968df1ce authored by Ricki Hirner's avatar Ricki Hirner 🐑

ProGuard: keep ThreeTen; update build tools and Kotlin version

parent f99ee40e
Pipeline #11070403 failed with stage
in 1 minute and 20 seconds
......@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 26
buildToolsVersion '26.0.0'
buildToolsVersion '26.0.1'
defaultConfig {
applicationId "at.bitfire.davdroid"
......
......@@ -16,16 +16,14 @@
-dontwarn ezvcard.io.json.** # JSON serializer (for jCards) not used
-dontwarn freemarker.** # freemarker templating library (for creating hCards) not used
-dontwarn org.jsoup.** # jsoup library (for hCard parsing) not used
-dontwarn sun.misc.Perf
-keep class ezvcard.property.** { *; } # keep all VCard properties (created at runtime)
# ical4j: ignore unused dynamic libraries
-dontwarn aQute.**
-dontwarn groovy.** # Groovy-based ContentBuilder not used
-dontwarn org.codehaus.groovy.**
-dontwarn net.fortuna.ical4j.model.** # ignore warnings from Groovy dependency
-dontwarn org.apache.log4j.** # ignore warnings from log4j dependency
-keep class net.fortuna.ical4j.** { *; } # keep all model classes (properties/factories, created at runtime)
-keep class org.threeten.bp.** { *; } # keep ThreeTen (for time zone processing)
# okhttp
-dontwarn okio.**
......
......@@ -8,7 +8,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.1.4'
ext.kotlin_version = '1.1.4-2'
repositories {
jcenter()
......
Subproject commit d44ef388167f6e353d676cec8c75082e1b3f7db2
Subproject commit 59659455ceecb4ab4f949c825af71603308f5f3f
Subproject commit 4b136453631ae7d0fe8666d2aa5d7196969ef249
Subproject commit cc4bfc6a1ab4504268f59f029595a2cd498dae40
Subproject commit d501bd45f2391edb3dafeb737f20e0860e91475d
Subproject commit 3cff6c85a7df1b10644e1ce85cbd5b55023b433c
Subproject commit 48c64fc88509409d868b49c5c7ba99ae1ed8fb3a
Subproject commit 4e1b44bbf5cb14eecff9624627296f5f8a1a2f43
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment