Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Brian Floersch 2018-01-14 17:54:25 -05:00
commit f3eb723ab0
3 changed files with 9 additions and 4 deletions

View file

@ -1,6 +1,11 @@
Changelog
==========
Version 3.2.3 *(2018-01-14)*
----------------------------
* An F-droid build only, fixing a compile error
Version 3.2.2 *(2018-01-09)*
----------------------------

View file

@ -9,8 +9,8 @@ android {
applicationId "com.simplemobiletools.gallery"
minSdkVersion 16
targetSdkVersion 27
versionCode 155
versionName "3.2.2"
versionCode 156
versionName "3.2.3"
multiDexEnabled true
setProperty("archivesBaseName", "gallery")
}
@ -42,7 +42,7 @@ ext {
}
dependencies {
implementation 'com.simplemobiletools:commons:3.6.15'
implementation 'com.simplemobiletools:commons:3.7.2'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
implementation 'com.android.support:multidex:1.0.2'
implementation 'com.google.code.gson:gson:2.8.2'

View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip