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

Commit 0d29b253 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dependencies; use Locale.US instead of Locale.ROOT for parsing HTTP dates

parent 7dda4ab5

build.gradle.kts

+7 −12
Original line number Original line Diff line number Diff line
@@ -8,18 +8,19 @@ object Libs { 
    const val xpp3Version = "1.1.6"

    const val xpp3Version = "1.1.6"

}

}





group="com.gitlab.bitfireAT"



repositories {

repositories {

    jcenter()

    mavenCentral()

}

}





group="com.gitlab.bitfireAT"

version="1.0"



plugins {

plugins {

    kotlin("jvm") version "1.5.10"

    kotlin("jvm") version "1.5.21"

    `maven-publish`





    id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"

    //id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"

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

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

    maven

}

}





tasks {

tasks {
@@ -42,9 +43,3 @@ dependencies { 




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

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

}
 
}
 


buildConfigKotlin {

    sourceSet("main", Action {

        buildConfig(name = "okhttpVersion", value = Libs.okhttpVersion)

    })

}

gradle/wrapper/gradle-wrapper.properties

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

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip

src/main/kotlin/at/bitfire/dav4jvm/HttpUtils.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ object HttpUtils { 
     * @return date, or null if date could not be parsed

     * @return date, or null if date could not be parsed

     */

     */

    fun parseDate(dateStr: String) = try {

    fun parseDate(dateStr: String) = try {

        DateUtils.parseDate(dateStr, Locale.ROOT,

        DateUtils.parseDate(dateStr, Locale.US,

                httpDateFormatStr,

                httpDateFormatStr,

                "EEE, dd MMM yyyy HH:mm:ss zzz", // RFC 822, updated by RFC 1123 with any TZ

                "EEE, dd MMM yyyy HH:mm:ss zzz", // RFC 822, updated by RFC 1123 with any TZ

                "EEEE, dd-MMM-yy HH:mm:ss zzz", // RFC 850, obsoleted by RFC 1036 with any TZ.

                "EEEE, dd-MMM-yy HH:mm:ss zzz", // RFC 850, obsoleted by RFC 1036 with any TZ.