gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

make httpclient compileOnly since it ships with the OS

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-10 17:53:27 +02:00
parent 6ba541b6b1
commit f899ee1d2f
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@ -97,6 +97,8 @@ android {
] ]
} }
} }
useLibrary 'org.apache.http.legacy'
} }
dexOptions { dexOptions {
@ -113,6 +115,7 @@ android {
packagingOptions { packagingOptions {
exclude 'META-INF/LICENSE.txt' exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/LICENSE' exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE'
exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/rxjava.properties' exclude 'META-INF/rxjava.properties'
@ -293,6 +296,10 @@ dependencies {
implementation 'org.osmdroid:osmdroid-android:6.1.10' implementation 'org.osmdroid:osmdroid-android:6.1.10'
implementation 'fr.dudie:nominatim-api:3.4' implementation 'fr.dudie:nominatim-api:3.4'
//noinspection DuplicatePlatformClasses
api 'org.apache.httpcomponents:httpclient:4.5.9' // Android comes with its own httpclient
// nominatim-api uses httpclient
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.11.0' testImplementation 'org.mockito:mockito-core:3.11.0'
testImplementation "org.powermock:powermock-core:${powermockVersion}" testImplementation "org.powermock:powermock-core:${powermockVersion}"

1
app/src/main/java/com/nextcloud/talk/controllers/GeocodingController.kt
View File

@ -22,7 +22,6 @@ package com.nextcloud.talk.controllers
import android.app.SearchManager import android.app.SearchManager
import android.content.Context import android.content.Context
import android.graphics.drawable.ColorDrawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.text.InputType import android.text.InputType

2
build.gradle
View File

@ -49,8 +49,6 @@ buildscript {
configurations.all { configurations.all {
// check for updates every build // check for updates every build
resolutionStrategy.cacheChangingModulesFor 3600, 'seconds' resolutionStrategy.cacheChangingModulesFor 3600, 'seconds'
exclude module: 'httpclient'
exclude module: 'commons-logging'
} }
allprojects { allprojects {