arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-02 10:51:10 +00:00
Code Issues Releases Wiki Activity

Upgrade to okhttp/2.7.1

Browse Source
This commit is contained in:
Ricki Hirner 2016-01-02 10:59:52 +01:00
parent 9ec4a4015d
commit be6aa1b6a2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -58,7 +58,7 @@ dependencies {
compile 'dnsjava:dnsjava:2.1.7'
compile 'org.apache.commons:commons-lang3:3.4'
provided 'org.projectlombok:lombok:1.16.6'
compile('org.slf4j:slf4j-android:1.7.13')
compile 'org.slf4j:slf4j-android:1.7.13'
compile project(':dav4android')
compile project(':ical4android')
@ -66,5 +66,5 @@ dependencies {
compile project(':MemorizingTrustManager')
androidTestCompile 'com.squareup.okhttp:mockwebserver:2.6.0'
androidTestCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
}

2
app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
View File

@ -110,7 +110,7 @@ public class DavResourceFinder {
1. user-given URL is a calendar
2. user-given URL has a calendar-home-set property (i.e. is a principal URL)
*/
log.info("Check whether user-given URL is a calendar collection and/or contains <calendar-home-set> and/or has <current-user-principal>");
log.info("Check whether user-given URL is a calendar collection and/or contains home-set and/or has current-user-principal");
DavResource davBase = new DavResource(log, httpClient, userURL);
try {
if (service == Service.CALDAV) {

2
dav4android

@ -1 +1 @@
Subproject commit ea03135d7dd194832fdcc8b47bd041b87d918edb
Subproject commit f060f00fe6ccf5e8a79690c8707cf2b1d98a3d17

2
ical4android

@ -1 +1 @@
Subproject commit 46d23fb4ff276f4efb317069b7c072d5c29ba4d2
Subproject commit 652eac6f3f9fe5adb94e6142d1bad5761b468feb