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

Commit 489e09ea authored by Michael Biebl's avatar Michael Biebl Committed by Ricki Hirner
Browse files

Drop AboutInfo override for dav4jvm 

With the recent move to GitHub, the AboutInfo override for dav4jvm was
broken as it still used com_gitlab_bitfireAT__dav4jvm whereas it is now:
```
$ ./gradlew findLibraries | grep dav4jvm
bitfireAT/dav4jvm (f1d9354a41) -> com_github_bitfireAT__dav4jvm
Manually requested license: mpl_2_0
```

Since the autogenerated dav4jvm AboutInfo looks fine (see attached
screenshot), remove the override.
parent 3403992c

app/build.gradle

+0 −6
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ android { 
    }

}



aboutLibraries {

    additionalLicenses {

        mpl_2_0

    }

}



dependencies {

    implementation project(':cert4android')

    implementation project(':ical4android')

app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ class AboutActivity: AppCompatActivity() { 
                                .withLibraryModification("org_brotli__dec", Libs.LibraryFields.LIBRARY_NAME, "Brotli")

                                .withLibraryModification("org_brotli__dec", Libs.LibraryFields.AUTHOR_NAME, "Google")



                                .withExcludedLibraries("com_gitlab_bitfireAT__dav4jvm")



                                .supportFragment()

                    }

                }

app/src/main/res/values/about_libraries.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <string name="define_plu_dav4jvm"></string>

    <string name="library_dav4jvm_libraryName">dav4jvm</string>

    <string name="library_dav4jvm_libraryDescription">dav4jvm is a WebDAV/CalDAV/CardDAV library for JVM (Java/Kotlin).</string>

    <string name="library_dav4jvm_libraryWebsite">https://gitlab.com/bitfireAT/dav4jvm</string>

    <string name="library_dav4jvm_repositoryLink">https://gitlab.com/bitfireAT/dav4jvm</string>

    <string name="library_dav4jvm_author">Ricki Hirner</string>

    <string name="library_dav4jvm_licenseIds">mpl_2_0</string>

    <string name="library_dav4jvm_isOpenSource">true</string>

</resources>
 
 No newline at end of file