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

Commit 677b6a1a authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '944-update_with_upstream' into 'main' 

944-update_with_upstream

See merge request !89
parents 71e21495 68690af8

.github/FUNDING.yml

+2 −1
Original line number Diff line number Diff line 


github: bitfireAT

liberapay: DAVx5

custom: [ 'https://www.davx5.com/donate' ]
 
custom: 'https://www.davx5.com/donate'

.tx/config

+8 −12
Original line number Diff line number Diff line
@@ -4,27 +4,23 @@ host = https://www.transifex.com 
[davx5.app]

source_file = app/src/main/res/values/strings.xml

source_lang = en

minimum_perc = 0

minimum_perc = 20

file_filter = app/src/main/res/values-<lang>/strings.xml

trans.de = app/src/main/res/values-de/strings.xml

trans.tr_TR = app/src/main/res/values-tr/strings.xml

trans.zh_CN = app/src/main/res/values-zh/strings.xml

lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-rFR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW

type = ANDROID



[davx5.metadata-short-description]

file_filter = fastlane/metadata/android/<lang>/short_description.txt

minimum_perc = 100

source_file = fastlane/metadata/android/en-US/short_description.txt

source_lang = en

trans.sl_SI = fastlane/metadata/android/sl-SI/short_description.txt

trans.zh_CN = fastlane/metadata/android/zh/short_description.txt

minimum_perc = 100

file_filter = fastlane/metadata/android/<lang>/short_description.txt

lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW

type = TXT



[davx5.metadata-full-description]

file_filter = fastlane/metadata/android/<lang>/full_description.txt

minimum_perc = 100

source_file = fastlane/metadata/android/en-US/full_description.txt

source_lang = en

trans.sl_SI = fastlane/metadata/android/sl-SI/full_description.txt

trans.zh_CN = fastlane/metadata/android/zh/full_description.txt

minimum_perc = 100

file_filter = fastlane/metadata/android/<lang>/full_description.txt

lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW

type = TXT

README.md

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ DAVx⁵ is licensed under the [GPLv3 License](LICENSE). 


News and updates: [@davx5app](https://twitter.com/davx5app) on Twitter



**Help, discussion, feature requests, bug reports: [DAVx⁵ forums](https://www.davx5.com/forums)**

**Help, feature requests, bug reports: [DAVx⁵ discussions](https://github.com/bitfireAT/davx5-ose/discussions)**



Parts of DAVx⁵ have been outsourced into these libraries:
@@ -28,7 +28,7 @@ USED THIRD-PARTY LIBRARIES 


The most important libraries which are used by DAVx⁵ (alphabetically):



* [dnsjava](http://www.xbill.org/dnsjava/) – [BSD License](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE)

* [ez-vcard](https://github.com/mangstadt/ez-vcard) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)

* [iCal4j](https://github.com/ical4j/ical4j) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)

* [dnsjava](https://github.com/dnsjava/dnsjava) – [BSD License](https://github.com/dnsjava/dnsjava/blob/master/LICENSE)

* [ez-vcard](https://github.com/mangstadt/ez-vcard) – [New BSD License](https://github.com/mangstadt/ez-vcard/blob/master/LICENSE)

* [iCal4j](https://github.com/ical4j/ical4j) – [New BSD License](https://github.com/ical4j/ical4j/blob/develop/LICENSE.txt)

* [okhttp](https://square.github.io/okhttp) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)

app/build.gradle

+27 −16
Original line number Diff line number Diff line
@@ -10,20 +10,20 @@ apply plugin: 'kotlin-android-extensions' 
apply plugin: 'kotlin-kapt'



android {

    compileSdkVersion 32

    buildToolsVersion '32.0.0'

    compileSdkVersion 33

    buildToolsVersion '33.0.0'



    defaultConfig {

        applicationId "foundation.e.accountmanager"



        versionCode 402030300

        versionName '4.2.3.3'

        versionCode 402060000

        versionName '4.2.6'

        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"



        setProperty "archivesBaseName", "davx5-ose-" + getVersionName()



        minSdkVersion 24        // Android 7.1

        targetSdkVersion 32     // Android 12v2

        targetSdkVersion 33     // Android 13



        buildConfigField "String", "userAgent", "\"DAVx5\""

        buildConfigField "String", "EMAIL_KEY", "\"${emailKey()}\""
@@ -53,6 +53,9 @@ android { 
        dataBinding = true

    }



    // Java namespace for our classes (not to be confused with Android package ID)

    namespace 'at.bitfire.davdroid'



    flavorDimensions "distribution"

    productFlavors {

        ose {
@@ -109,28 +112,33 @@ dependencies { 
    implementation project(':dav4android')



    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'



    implementation "com.google.dagger:hilt-android:${versions.hilt}"

    kapt "com.google.dagger:hilt-android-compiler:${versions.hilt}"



    implementation 'androidx.appcompat:appcompat:1.5.0'

    implementation 'androidx.appcompat:appcompat:1.5.1'

    implementation 'androidx.browser:browser:1.4.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.concurrent:concurrent-futures-ktx:1.1.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation 'androidx.core:core-ktx:1.8.0'

    implementation 'androidx.fragment:fragment-ktx:1.5.2'

    implementation 'androidx.core:core-ktx:1.9.0'

    implementation 'androidx.fragment:fragment-ktx:1.5.4'

    implementation 'androidx.hilt:hilt-work:1.0.0'

    kapt 'androidx.hilt:hilt-compiler:1.0.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'

    implementation 'androidx.paging:paging-runtime-ktx:3.1.1'

    implementation 'androidx.preference:preference-ktx:1.2.0'

    implementation 'androidx.security:security-crypto:1.1.0-alpha03'

    implementation 'androidx.security:security-crypto:1.1.0-alpha04'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.work:work-runtime-ktx:2.7.1'

    implementation 'com.google.android.flexbox:flexbox:3.0.0'

    implementation 'androidx.recyclerview:recyclerview:1.2.1'

    implementation 'com.google.android.material:material:1.6.1'

    implementation 'androidx.work:work-runtime-ktx:2.7.1'

    implementation 'com.google.android.material:material:1.7.0'



    def room_version = '2.4.3'

    implementation "androidx.room:room-runtime:$room_version"
@@ -145,7 +153,8 @@ dependencies { 
    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"

    implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}"

    implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"

    implementation 'commons-io:commons-io:2.8.0' // don't update until API level 26 (Android 8) is the minimum API (DAVx5#130)

    //noinspection GradleDependency - don't update until API level 26 (Android 8) is the minimum API [https://github.com/bitfireAT/davx5/issues/130]

    implementation 'commons-io:commons-io:2.8.0'

    //noinspection GradleDependency - dnsjava 3+ needs Java 8/Android 7

    implementation 'dnsjava:dnsjava:2.1.9'

    //noinspection GradleDependency
@@ -162,12 +171,14 @@ dependencies { 
    androidTestImplementation "com.google.dagger:hilt-android-testing:${versions.hilt}"

    kaptAndroidTest "com.google.dagger:hilt-android-compiler:${versions.hilt}"



    androidTestImplementation 'androidx.test:core-ktx:1.4.0'

    androidTestImplementation 'androidx.test:runner:1.4.0'

    androidTestImplementation 'androidx.test:rules:1.4.0'

    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'

    androidTestImplementation 'androidx.test:core-ktx:1.5.0'

    androidTestImplementation 'androidx.test:runner:1.5.1'

    androidTestImplementation 'androidx.test:rules:1.5.0'

    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.4'

    androidTestImplementation 'androidx.work:work-testing:2.7.1'

    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

    androidTestImplementation 'io.mockk:mockk-android:1.12.3'

    androidTestImplementation 'io.mockk:mockk-android:1.13.2'

    androidTestImplementation 'junit:junit:4.13.2'



    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

}

app/src/androidTest/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest package="at.bitfire.davdroid"

          xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:tools="http://schemas.android.com/tools"

          android:installLocation="internalOnly">