diff options
| author | Nick Bradbury <nbradbury@users.noreply.github.com> | 2016-09-28 11:50:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 11:50:23 -0400 |
| commit | 4009c989837fce64d3969048c215c9f252417f5d (patch) | |
| tree | 9981eb2983ec1178405ae72c7bbd1737ee55c5a0 | |
| parent | 476d1d82591010f700ea2af24f05eecf66f5d12e (diff) | |
| parent | 243a19b38c42c66c17371c31dbb5192ded926e11 (diff) | |
| download | gradle-perf-android-medium-4009c989837fce64d3969048c215c9f252417f5d.tar.gz | |
Merge pull request #4565 from wordpress-mobile/issue/4454-crop-crash-zero-width
Upgrade image cropping library to latest version (New PR)
| -rw-r--r-- | WordPress/build.gradle | 3 | ||||
| -rw-r--r-- | WordPress/lint.xml | 2 | ||||
| -rw-r--r-- | WordPress/proguard.cfg | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/WordPress/build.gradle b/WordPress/build.gradle index c5221ddaa..0d435f8f2 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -105,13 +105,14 @@ dependencies { compile 'org.wordpress:persistentedittext:1.0.1' compile 'org.wordpress:emailchecker2:1.1.0' - compile 'com.yalantis:ucrop:1.5.0' + compile 'com.yalantis:ucrop:2.2.0' compile 'com.github.xizzhu:simple-tool-tip:0.5.0' androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0' androidTestCompile 'org.objenesis:objenesis:2.1' androidTestCompile 'org.mockito:mockito-core:+' androidTestCompile 'com.squareup.okhttp:mockwebserver:2.7.5' + androidTestCompile 'com.squareup.okio:okio:1.9.0' // explicitly compile okio to match the version needed by ucrop // Provided by the WordPress-Android Repository compile 'org.wordpress:drag-sort-listview:0.6.1' // not found in maven central diff --git a/WordPress/lint.xml b/WordPress/lint.xml index d912c2644..02a1dcb73 100644 --- a/WordPress/lint.xml +++ b/WordPress/lint.xml @@ -5,7 +5,7 @@ <issue id="RtlCompat" severity="warning" /> <issue id="InvalidPackage"> - <ignore regexp="okio-1.6.0.jar" /> + <ignore regexp="okio-1.9.0.jar" /> </issue> <issue id="NewApi"> diff --git a/WordPress/proguard.cfg b/WordPress/proguard.cfg index 0fe5a991c..615537188 100644 --- a/WordPress/proguard.cfg +++ b/WordPress/proguard.cfg @@ -24,3 +24,7 @@ -keepattributes Signature -keepattributes *Annotation* + +-dontwarn com.yalantis.ucrop** +-keep class com.yalantis.ucrop** { *; } +-keep interface com.yalantis.ucrop** { *; } |