mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-28 21:33:53 +01:00
Fix conflicts
This commit is contained in:
commit
e6f36336f8
39 changed files with 2687 additions and 219 deletions
|
|
@ -83,8 +83,6 @@ dependencies {
|
|||
implementation "androidx.cardview:cardview:1.0.0"
|
||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
||||
implementation "androidx.exifinterface:exifinterface:1.0.0"
|
||||
//swipe_layout
|
||||
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
|
||||
//metadata extractor
|
||||
implementation 'com.drewnoakes:metadata-extractor:2.11.0'
|
||||
}
|
||||
|
|
@ -93,8 +91,8 @@ android {
|
|||
buildToolsVersion "28.0.3"
|
||||
defaultConfig {
|
||||
applicationId 'fr.free.nrw.commons'
|
||||
versionCode 243
|
||||
versionName '2.10.2'
|
||||
versionCode 475
|
||||
versionName '2.11.0'
|
||||
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 28
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue