diff options
| -rw-r--r-- | build.gradle | 24 | ||||
| -rw-r--r-- | proguard-rules.pro | 25 |
2 files changed, 34 insertions, 15 deletions
diff --git a/build.gradle b/build.gradle index affa2a6d7..bff8e7aaf 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,9 @@ repositories { maven { url 'https://maven.google.com' } + maven { + url "https://jitpack.io" + } } allprojects { @@ -31,13 +34,13 @@ configurations { } ext { - supportLibVersion = '27.0.1' + supportLibVersion = '27.0.2' } dependencies { compile project(':libs:MemorizingTrustManager') compile project(':libs:android-transcoder') - standardPushCompile 'com.google.android.gms:play-services-gcm:11.0.4' + standardPushCompile 'com.google.android.gms:play-services-gcm:11.8.0' compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' compile 'org.bouncycastle:bcprov-jdk15on:1.56' @@ -53,7 +56,7 @@ dependencies { compile 'org.whispersystems:signal-protocol-java:2.6.2' compile 'com.makeramen:roundedimageview:2.3.0' compile 'jetty:javax.servlet:5.1.12' - compile 'com.google.code.gson:gson:2.7' + compile 'com.google.code.gson:gson:2.8.0' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' compile "com.android.support:support-v13:$supportLibVersion" compile "com.android.support:appcompat-v7:$supportLibVersion" @@ -64,9 +67,9 @@ dependencies { compile 'com.github.bumptech.glide:glide:3.8.0' compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3' - compile 'com.google.android.gms:play-services-location:11.0.4' - compile 'com.google.android.gms:play-services-maps:11.0.4' - compile 'pub.devrel:easypermissions:1.0.0' + compile 'com.google.android.gms:play-services-location:11.8.0' + compile 'com.google.android.gms:play-services-maps:11.8.0' + compile 'pub.devrel:easypermissions:1.1.1' compile 'com.wefika:flowlayout:0.4.1' compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2' } @@ -82,6 +85,10 @@ android { buildToolsVersion "26.0.2" defaultConfig { + jackOptions { + enabled true + } + minSdkVersion 16 targetSdkVersion 25 @@ -105,8 +112,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } productFlavors { @@ -144,6 +151,7 @@ android { debuggable false signingConfig = signingConfigs.release minifyEnabled true + shrinkResources true runProguard true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/proguard-rules.pro b/proguard-rules.pro index cc87272f6..b17333ced 100644 --- a/proguard-rules.pro +++ b/proguard-rules.pro @@ -1,8 +1,19 @@ --keep public class com.google.android.gms.* { public *; } --keepnames @com.google.android.gms.common.annotation.KeepName class * --keepclassmembernames class * { - @com.google.android.gms.common.annotation.KeepName *; +-dontobfuscate + +-keep class de.pixart.messenger.** +-keep class org.whispersystems.** +-keep class com.kyleduo.switchbutton.Configuration +-keep class com.soundcloud.android.crop.** +-keep class com.google.android.gms.** +-keep class org.openintents.openpgp.* +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** { + **[] $VALUES; + public *; } --dontwarn com.google.android.gms.** --dontwarn com.google.common.cache.** --dontwarn com.google.common.primitives.**
\ No newline at end of file + +-dontwarn org.bouncycastle.mail.** +-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper +-dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi +-dontwarn org.bouncycastle.cert.dane.** |