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

Commit 039e1ef5 authored by Sumit Pundir's avatar Sumit Pundir
Browse files

Merge remote-tracking branch 'bitfireAT/master' into sprint

parents 99334a5b d7c21fb4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ cache:
build:
  stage: build
  script:
  - ./gradlew build
 No newline at end of file
  - ./gradlew dokka 
+28 −12
Original line number Diff line number Diff line

[![build status](https://gitlab.com/bitfireAT/dav4android/badges/master/build.svg)](https://gitlab.com/bitfireAT/dav4android/commits/master)
# dav4jvm

dav4jvm is a WebDAV/CalDAV/CardDAV library for JVM (Java/Kotlin). It has
been developed for [DAVx⁵](https://www.davx5.com) initially.

# dav4android
Repository: https://gitlab.com/bitfireAT/dav4jvm/

dav4android is an Android WebDAV/CalDAV/CardDAV library which has
initially been developed for [DAVdroid](https://www.davdroid.com).
Discussion: https://forums.bitfire.at/category/18/libraries

Original repository: https://gitlab.com/bitfireAT/dav4android/
Generated KDoc: https://bitfireAT.gitlab.io/dav4jvm/dokka/dav4jvm/

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

## How to use

You can use [jitpack.io to include dav4jvm](https://jitpack.io/#com.gitlab.bitfireAT/dav4jvm):

    allprojects {
        repositories {
            maven { url 'https://jitpack.io' }
        }
    }
    dependencies {
        implementation 'com.gitlab.bitfireAT:dav4jvm:master-SNAPSHOT'
    }

dav4jvm needs a working XmlPullParser (XPP). On Android, the system already comes with
XPP and you don't need to include one; on other systems, you may need to
import for instance `org.ogce:xpp3` to get dav4jvm to work.


## Contact / License

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

For questions, suggestions etc. please use the DAVdroid forum:
https://www.davdroid.com/forums/
For questions, suggestions etc. use this forum:
https://forums.bitfire.at/category/18/libraries

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)
send a merge request.


## Contributors

  * Ricki Hirner (initial contributor)
  * David González Verdugo (dgonzalez@owncloud.com)
  * Matt Jacobsen (https://gitlab.com/mattjacobsen)

build.gradle

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line

buildscript {
    ext.kotlin_version = '1.3.10'
    ext.dokka_version = '0.9.17'

    repositories {
        google()
        jcenter()
    }

    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
    }
}

repositories {
    google()
    jcenter()
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'org.jetbrains.dokka-android'

ext {
    okhttp_version = '3.11.0'
}

android {
    compileSdkVersion 27
    buildToolsVersion '27.1.1'

    defaultConfig {
        //noinspection MinSdkTooLow
        minSdkVersion 24
        targetSdkVersion 27

        buildConfigField "String", "version_okhttp", "\"$okhttp_version\""
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    lintOptions {
        disable 'AllowBackup'
    }

    defaultConfig {
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
}

dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    api "com.squareup.okhttp3:okhttp:$okhttp_version"

    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"
    androidTestImplementation 'com.android.support.test:runner:1.0.2'

    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
}

build.gradle.kts

0 → 100644
+55 −0
Original line number Diff line number Diff line
import org.jetbrains.dokka.gradle.DokkaTask

object Libs {
    // okhttp HTTP library
    // We'll use 3.12 for now, but this branch won't receive feature updates anymore. Security
    // updates are limited to Dec 2020, so we'll have to update to 3.13 until then. On Android,
    // using 3.13 will raise the required SDK level to Android 5.
    const val okhttpVersion = "3.12.6"

    // XmlPullParser library
    const val xpp3Version = "1.1.6"
}

group="com.gitlab.bitfireAT"

repositories {
    jcenter()
}

plugins {
    kotlin("jvm") version "1.3.50"

    id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"
    id("org.jetbrains.dokka") version "0.10.0"
    maven
}

tasks {
    val dokka by getting(DokkaTask::class) {
        configuration {
            sourceLink {
                url = "https://gitlab.com/bitfireAT/dav4jvm/tree/master/"
                lineSuffix = "#L"
            }
        }
    }
}

dependencies {
    implementation(kotlin("stdlib"))

    // use Kotlin-friendly okhttp 2.x
    implementation("com.squareup.okio:okio:2.+")
    api("com.squareup.okhttp3:okhttp:${Libs.okhttpVersion}")

    api("org.ogce:xpp3:${Libs.xpp3Version}")

    testImplementation("com.squareup.okhttp3:mockwebserver:${Libs.okhttpVersion}")
}

buildConfigKotlin {
    sourceSet("main", Action {
        buildConfig(name = "okhttpVersion", value = Libs.okhttpVersion)
    })
}
+2 −10
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
#

#Tue Aug 23 16:42:17 CEST 2016
#Wed Apr 17 22:31:47 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
Loading