mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into structured-data

Browse source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
#	app/src/main/java/fr/free/nrw/commons/contributions/model/DisplayableContribution.java
#	app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
#	app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
This commit is contained in:
Sean Mac Gillicuddy 2020-03-20 08:46:39 +00:00
commit 719f32c27e
127 changed files with 1946 additions and 1520 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/build.gradle
View file

@ -5,6 +5,7 @@ apply from: '../gitutils.gradle'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
apply plugin: "com.hiya.jacoco-android"
apply from: 'quality.gradle'
@ -38,6 +39,7 @@ dependencies {
implementation 'com.github.pedrovgs:renderers:3.3.3'
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.2'
implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0'
implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.4.0'
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
implementation 'com.dinuscxj:circleprogressbar:1.1.1'
implementation 'com.karumi:dexter:5.0.0'
@ -105,13 +107,18 @@ dependencies {
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
//Room
def room_version= '2.2.3'
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version" // For Kotlin use kapt instead of annotationProcessor
implementation "androidx.room:room-runtime:$ROOM_VERSION"
implementation "androidx.room:room-ktx:$ROOM_VERSION"
implementation "androidx.room:room-rxjava2:$ROOM_VERSION"
kapt "androidx.room:room-compiler:$ROOM_VERSION" // For Kotlin use kapt instead of annotationProcessor
implementation 'com.squareup.retrofit2:retrofit:2.7.1'
implementation "androidx.room:room-rxjava2:$room_version"
testImplementation "androidx.arch.core:core-testing:2.1.0"
// Pref
// Java language implementation
implementation "androidx.preference:preference:$PREFERENCE_VERSION"
// Kotlin
implementation "androidx.preference:preference-ktx:$PREFERENCE_VERSION"
}
android {
@ -293,3 +300,7 @@ if(isRunningOnTravisAndIsNotPRBuild) {
}
}
}
androidExtensions {
experimental = true
}