diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-08-26 23:48:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-08-28 21:33:19 +0200 |
| commit | b3b3475e93a9b08f9e35edbf74673728b560ad3b (patch) | |
| tree | fc72bfce668b358310061c0a94736a0bd14e8b5d /build.gradle | |
| parent | 1f7f535d37b844dbd87447e1872c270edbca1302 (diff) | |
compress videos bigger than 10 MB before sending
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 74d561104..46c0c3b6f 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { compile 'jetty:javax.servlet:5.1.12' compile 'com.google.code.gson:gson:2.4' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - compile 'com.android.support:appcompat-v7:24.1.1' + compile 'com.android.support:appcompat-v7:24.2.0' compile 'com.android.support:multidex:1.0.1' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.chrisbanes:PhotoView:1.3.0' @@ -57,6 +57,8 @@ dependencies { compile 'com.google.android.gms:play-services-maps:9.4.0' compile 'pub.devrel:easypermissions:0.1.9' compile "com.wefika:flowlayout:0.4.1" + compile files('libs/aspectjrt-1.7.3.jar') + compile files('libs/isoparser-1.0.6.jar') playstoreCompile 'com.google.android.gms:play-services-gcm:9.4.0' } @@ -74,8 +76,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 24 - versionCode 160 - versionName "1.13.9" + versionCode 161 + versionName "1.14.0-beta1" archivesBaseName += "-$versionName" applicationId "de.pixart.messenger" multiDexEnabled true @@ -113,6 +115,11 @@ android { buildTypes.release.signingConfig = null } + sourceSets.main { + jniLibs.srcDir 'libs' + jni.srcDirs = [] //disable automatic ndk-build call + } + lintOptions { disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' } |