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

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

Update dependencies (including dav4jvm on Github instead of Gitlab)

parent 2504a810

app/build.gradle

+5 −5
Original line number Original line Diff line number Diff line
@@ -129,14 +129,14 @@ dependencies { 
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

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





    implementation 'androidx.appcompat:appcompat:1.3.1'

    implementation 'androidx.appcompat:appcompat:1.3.1'

    implementation 'androidx.browser:browser:1.3.0'

    implementation 'androidx.browser:browser:1.4.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'

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

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

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

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

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

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

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

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

    implementation 'androidx.paging:paging-runtime-ktx:3.1.0-beta01'

    implementation 'androidx.paging:paging-runtime-ktx:3.1.0-rc01'

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

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

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

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

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
@@ -152,7 +152,7 @@ dependencies { 




    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"

    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"

    implementation("com.gitlab.bitfireAT:dav4jvm:${versions.dav4jvm}") {

    implementation("com.github.bitfireAT:dav4jvm:${versions.dav4jvm}") {

        exclude group: 'junit'

        exclude group: 'junit'

    }

    }

    implementation "com.mikepenz:aboutlibraries:${versions.aboutLibraries}"

    implementation "com.mikepenz:aboutlibraries:${versions.aboutLibraries}"

app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ class AccountActivity: AppCompatActivity() { 
                val account: Account

                val account: Account

        ): ViewModelProvider.Factory {

        ): ViewModelProvider.Factory {

            @Suppress("UNCHECKED_CAST")

            @Suppress("UNCHECKED_CAST")

            override fun <T : ViewModel?> create(modelClass: Class<T>) =

            override fun <T: ViewModel> create(modelClass: Class<T>) =

                    Model(application, account) as T

                    Model(application, account) as T

        }

        }

app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ abstract class CollectionsFragment: Fragment(), SwipeRefreshLayout.OnRefreshList 
    val model by viewModels<Model> {

    val model by viewModels<Model> {

        object: ViewModelProvider.Factory {

        object: ViewModelProvider.Factory {

            @Suppress("UNCHECKED_CAST")

            @Suppress("UNCHECKED_CAST")

            override fun <T : ViewModel?> create(modelClass: Class<T>): T =

            override fun <T: ViewModel> create(modelClass: Class<T>): T =

                    Model(requireActivity().application, accountModel) as T

                    Model(requireActivity().application, accountModel) as T

        }

        }

    }

    }

build.gradle

+1 −6
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ buildscript { 
    ext.versions = [

    ext.versions = [

        aboutLibraries: '8.9.1',

        aboutLibraries: '8.9.1',

        appIntro: '6.1.0',

        appIntro: '6.1.0',

        dav4jvm: '2a213b46',

        dav4jvm: 'f1d9354a41',

        dokka: '0.10.1',

        dokka: '0.10.1',

        kotlin: '1.5.31',

        kotlin: '1.5.31',

        okhttp: '4.9.1',

        okhttp: '4.9.1',
@@ -41,11 +41,6 @@ allprojects { 
        google()

        google()

        mavenCentral()

        mavenCentral()





        // dav4jvm (in case jitpack wouldn't work)

        /*maven {

            url "https://bitfireat.gitlab.io/dav4jvm/repo/"

        }*/



        // AppIntro, dav4jvm

        // AppIntro, dav4jvm

        maven { url "https://jitpack.io" }

        maven { url "https://jitpack.io" }

    }

    }

vcard4android @ c3ec1bbe

Compare 959570a7 to c3ec1bbe
Original line number Original line Diff line number Diff line 
Subproject commit 959570a724766327f0ab56427d6b92cd7f334b1d
 
Subproject commit c3ec1bbe16bcdcca8e7300b868f006c25fe29d73