mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-23 19:50:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Integrate cert4android as an android library (bitfireAT/davx5#274)

Browse source 
* Removed `cert4android` submodule

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>

* Added cert4android dependency

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>

* Update dependencies, fix invalid style

---------

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
Co-authored-by: Ricki Hirner <hirner@bitfire.at>
This commit is contained in:
Arnau Mora 2023-05-30 11:09:19 +02:00 committed by Ricki Hirner
parent 6d278b7e04
commit 17718a7ed8
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,6 +4,3 @@
[submodule "vcard4android"]
path = vcard4android
url = https://github.com/bitfireAT/vcard4android.git
[submodule "cert4android"]
path = cert4android
url = https://github.com/bitfireAT/cert4android.git

2
app/build.gradle
View file

@ -106,7 +106,7 @@ android {
}
dependencies {
implementation project(':cert4android')
implementation "com.github.bitfireAT:cert4android:${versions.cert4android}"
implementation project(':ical4android')
implementation project(':vcard4android')

2
app/src/main/res/layout/delete_collection.xml
View file

@ -17,7 +17,7 @@
android:padding="@dimen/activity_margin">
<TextView
style="@style/TextView.Heading"
style="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/delete_collection_confirm_title"/>

8
build.gradle
View file

@ -7,7 +7,6 @@ buildscript {
aboutLibraries: '10.6.2',
appIntro: '6.2.0',
composeBom: '2023.05.01',
dav4jvm: '47dd6a9',
hilt: '2.46.1',
kotlin: '1.8.21', // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
okhttp: '4.10.0',
@ -15,7 +14,10 @@ buildscript {
// latest Apache Commons versions that don't require Java 8 (Android 7)
commonsCollections: '4.2',
commonsLang: '3.8.1',
commonsText: '1.3'
commonsText: '1.3',
// own libraries
cert4android: 'c87a7e9',
dav4jvm: '47dd6a9'
]
repositories {
@ -27,7 +29,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

1
cert4android

@ -1 +0,0 @@
Subproject commit 53503d8c258687ffb36625630bb5a4d8ff07bd89