Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2654de4 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/bitfireAT/master' 

# Conflicts:
#	.gitlab-ci.yml
#	build.gradle
#	src/main/java/at/bitfire/dav4android/DavAddressBook.kt
#	src/main/java/at/bitfire/dav4android/DavCalendar.kt
#	src/main/java/at/bitfire/dav4android/DavCollection.kt
#	src/main/java/at/bitfire/dav4android/DavResource.kt
#	src/test/java/at/bitfire/dav4android/exception/HttpExceptionTest.kt
parents b6096a32 8010a09e

LICENSE

+373 −674

File changed.

Preview size limit exceeded, changes collapsed.

README.md

+11 −16
Original line number Diff line number Diff line
@@ -5,33 +5,28 @@ 
# dav4android



dav4android is an Android WebDAV/CalDAV/CardDAV library which has

primarily been developed for [DAVdroid](https://www.davdroid.com).

initially been developed for [DAVdroid](https://www.davdroid.com).



It's not intended as a general WebDAV framework for all kinds of

applications, but you may find it useful to fork and adapt it

to your needs.

Original repository: https://gitlab.com/bitfireAT/dav4android/



Generated KDoc: https://bitfireAT.gitlab.io/dav4android/dokka/dav4android/





## Contact

## Contact / License



```

bitfire web engineering – Stockmann, Hirner GesnbR

Florastraße 27

2540 Bad Vöslau, AUSTRIA

```



Email: [play@bitfire.at](mailto:play@bitfire.at) (do not use this)

dav4android is licensed under [Mozilla Public License, v. 2.0](LICENSE).



For questions, suggestions etc. please use the DAVdroid forum:

https://www.davdroid.com/forums/



If you want to contribute, please work in your own repository and then

notify us on your changes so that we can backport them.



Email: [play@bitfire.at](mailto:play@bitfire.at)



## License 



Copyright (C) bitfire web engineering (Ricki Hirner, Bernhard Stockmann).

## Contributors



This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome

to redistribute it under the conditions of the [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).

  * Ricki Hirner (initial contributor)

  * David González Verdugo (dgonzalez@owncloud.com)

build.gradle

+10 −8
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.50'

    ext.dokka_version = '0.9.16'

    ext.kotlin_version = '1.2.71'

    ext.dokka_version = '0.9.17'



    repositories {

        jcenter()
@@ -9,7 +9,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.1.3'

        classpath 'com.android.tools.build:gradle:3.2.0'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"

    }
@@ -25,16 +25,17 @@ apply plugin: 'kotlin-android' 
apply plugin: 'org.jetbrains.dokka-android'



ext {

    okhttp_version = "3.10.0"

    okhttp_version = '3.11.0'

}



android {

    compileSdkVersion 27

    buildToolsVersion '27.0.3'

    compileSdkVersion 28

    buildToolsVersion '28.0.3'



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 27

        //noinspection MinSdkTooLow

        minSdkVersion 9        // Android 2.3

        targetSdkVersion 28



        buildConfigField "String", "version_okhttp", "\"$okhttp_version\""

    }
@@ -65,4 +66,5 @@ dependencies { 
    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"

    testImplementation 'junit:junit:4.12'

    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"

    testImplementation 'org.ogce:xpp3:1.1.6'    // XmlPullParser

}

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

src/main/AndroidManifest.xml

+3 −7
Original line number Diff line number Diff line 
<!--

  ~ Copyright © Ricki Hirner (bitfire web engineering).

  ~ All rights reserved. This program and the accompanying materials

  ~ are made available under the terms of the GNU Public License v3.0

  ~ which accompanies this distribution, and is available at

  ~ http://www.gnu.org/licenses/gpl.html

  ~ This Source Code Form is subject to the terms of the Mozilla Public

  ~ License, v. 2.0. If a copy of the MPL was not distributed with this

  ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -11,6 +9,4 @@ 


    <uses-permission android:name="android.permission.INTERNET"/>



    <application android:label="@string/app_name"/>



</manifest>