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

Commit 5c067a2f authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Fix Maven package building

parent 77260d94

.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ cache: 
     - .gradle/



test:

  stage: test

  script:

    - ./gradlew check

  artifacts:
@@ -15,9 +16,10 @@ test: 
      - build/reports/



pages:

  stage: deploy

  script:

    - ./gradlew dokkaHtml

    - mkdir public && mv build/dokka public

    - ./gradlew dokkaHtml publishMavenPublicationToDav4jvmRepository

    - mkdir public && mv build/dokka public && mv build/repo public

  artifacts:

    paths:

      - public

CHANGELOG.md

+14 −10
Original line number Diff line number Diff line 


# Version 2.x



## Version 2.0



- now uses okhttp 4.5.0, which requires Android 5

- removed deprecated methods

## Version 2.1.3



If you need support for older Android versions, stay with 1.x.

- keep own repo (built by Gitlab CI)



## Version 2.1

## Version 2.1.2



- don't rely on ServiceLoader anymore

- add DAV:owner

- fix date parsing bug



## Version 2.1.1



- add ScheduleTag

- use okhttp 4.7.2



## Version 2.1.2

## Version 2.1



- add DAV:owner

- fix date parsing bug

- don't rely on ServiceLoader anymore



## Version 2.0



- now uses okhttp 4.5.0, which requires Android 5

- removed deprecated methods



If you need support for older Android versions, stay with 1.x.





# Version 1.x

build.gradle.kts

+19 −3
Original line number Diff line number Diff line
@@ -14,15 +14,30 @@ repositories { 
}



group="com.gitlab.bitfireAT"

version="1.0"

version="2.1.3"



plugins {

    kotlin("jvm") version "1.5.21"

    kotlin("jvm") version "1.5.30"

    `maven-publish`



    id("org.jetbrains.dokka") version "1.5.0"

}



publishing {

    publications {

        create<MavenPublication>("maven") {

            from(components["java"])

        }

    }



    repositories {

        maven {

            name = "dav4jvm"

            url = uri(layout.buildDirectory.dir("repo"))

        }

    }

}



tasks.withType<DokkaTask>().configureEach {

    dokkaSourceSets {

        named("main") {
@@ -37,11 +52,12 @@ tasks.withType<DokkaTask>().configureEach { 
}



dependencies {

    implementation(kotlin("stdlib"))

    implementation(kotlin("stdlib-jdk7"))



    api("com.squareup.okhttp3:okhttp:${Libs.okhttpVersion}")

    implementation("org.apache.commons:commons-lang3:3.8.1")    // last version that doesn't require Java 8

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



    testImplementation("junit:junit:4.13.2")

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

}

src/main/kotlin/at/bitfire/dav4jvm/property/SupportedCalendarComponentSet.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ data class SupportedCalendarComponentSet( 
                            components.supportsJournal = true

                        }

                        COMP ->

                            when (parser.getAttributeValue(null, "name")?.toUpperCase()) {

                            when (parser.getAttributeValue(null, "name")?.uppercase()) {

                                "VEVENT" -> components.supportsEvents = true

                                "VTODO" -> components.supportsTasks = true

                                "VJOURNAL" -> components.supportsJournal = true