Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
9
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
bitfire web engineering
DAVx⁵
Commits
e157322a
Commit
e157322a
authored
Jan 15, 2021
by
Ricki Hirner
🐑
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly show dav4jvm in About/Libraries
parent
40a35ac7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
1 deletion
+20
-1
app/build.gradle
app/build.gradle
+6
-0
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
+2
-0
app/src/main/res/values/about_libraries.xml
app/src/main/res/values/about_libraries.xml
+11
-0
build.gradle
build.gradle
+1
-1
No files found.
app/build.gradle
View file @
e157322a
...
...
@@ -106,6 +106,12 @@ android {
}
}
aboutLibraries
{
additionalLicenses
{
mpl_2_0
}
}
dependencies
{
implementation
project
(
':cert4android'
)
implementation
project
(
':ical4android'
)
...
...
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
View file @
e157322a
...
...
@@ -105,6 +105,8 @@ 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
0 → 100644
View file @
e157322a
<?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
build.gradle
View file @
e157322a
...
...
@@ -8,7 +8,7 @@
buildscript
{
ext
.
versions
=
[
aboutLibraries:
'8.6.
3
'
,
aboutLibraries:
'8.6.
5
'
,
appIntro:
'6.0.0'
,
dav4jvm:
'2.1.2'
,
dokka:
'0.10.1'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment