Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2025-05-30 19:00:13 +08:00 committed by Alper Öztürk
parent 419a14f1eb
commit bbe27f0a79
5 changed files with 42 additions and 18 deletions

View File

@ -268,39 +268,56 @@ android {
}
dependencies {
implementation("com.github.nextcloud:android-library:$androidLibraryVersion") {
// region Nextcloud Libs
implementation(libs.android.library) {
exclude group: "org.ogce", module: "xpp3" // unused in Android and brings wrong Junit version
}
// splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
implementation libs.splashscreen
implementation libs.android.common
// endregion
// Jetpack Compose
// region Splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
implementation libs.splashscreen
// endregion
// region Jetpack Compose
implementation(platform(libs.compose.bom))
implementation(libs.compose.ui)
implementation(libs.compose.ui.graphics)
implementation(libs.compose.material3)
debugImplementation(libs.compose.ui.tooling)
implementation(libs.compose.ui.tooling.preview)
// endregion
// Media3
// region Media3
implementation libs.media3.ui
implementation libs.media3.session
implementation libs.media3.exoplayer
implementation libs.media3.datasource
// endregion
// Room
// region Room
implementation libs.room.runtime
ksp "androidx.room:room-compiler:$roomVersion"
androidTestImplementation libs.room.testing
// endregion
// Espresso
// region Espresso
androidTestImplementation libs.espresso.core
androidTestImplementation libs.espresso.contrib
androidTestImplementation libs.espresso.web
androidTestImplementation libs.espresso.accessibility
androidTestImplementation libs.espresso.intents
androidTestImplementation libs.espresso.idling.resource
// endregion
// region Dagger
implementation libs.dagger
implementation libs.dagger.android
implementation libs.dagger.android.support
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
// endregion
compileOnly "org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2"
// remove after entire switch to lib v2
@ -348,12 +365,6 @@ dependencies {
spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0"
spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.9"
implementation "com.google.dagger:dagger:$daggerVersion"
implementation "com.google.dagger:dagger-android:$daggerVersion"
implementation "com.google.dagger:dagger-android-support:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
implementation "org.conscrypt:conscrypt-android:2.5.3"
implementation "me.zhanghai.android.fastscroll:library:1.3.0"
@ -429,8 +440,6 @@ dependencies {
gplayImplementation "com.google.android.gms:play-services-base:18.5.0"
gplayImplementation "com.google.android.play:review-ktx:2.0.2"
implementation "com.github.nextcloud.android-common:ui:$androidCommonLibraryVersion"
implementation "io.coil-kt:coil:2.7.0"
}

View File

@ -47,5 +47,5 @@ android {
dependencies {
implementation "androidx.appcompat:appcompat:$appCompatVersion"
implementation "com.github.zynkware:Document-Scanning-Android-SDK:$documentScannerVersion"
implementation "com.github.nextcloud.android-common:ui:$androidCommonLibraryVersion"
implementation libs.android.common
}

View File

@ -10,8 +10,6 @@
*/
buildscript {
ext {
androidLibraryVersion ="8e561c7e65f208492c20b106eb25cfbe43dc7189"
androidCommonLibraryVersion = "0.25.0"
androidPluginVersion = "8.9.2"
androidxMediaVersion = "1.5.1"
androidxTestVersion = "1.6.1"

View File

@ -2,6 +2,9 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
[versions]
androidCommonLibraryVersion = "0.25.0"
androidLibraryVersion = "2d47aa4a368b49465320c16609ad4427dd64ca86"
daggerVersion = "2.56.2"
espressoVersion = "3.6.1"
media3 = "1.5.1"
roomVersion = "2.6.1"
@ -48,6 +51,15 @@ spotbugs-gradle-plugin = { module = "com.github.spotbugs.snom:spotbugs-gradle-pl
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" }
# Android Library
android-library = { module = "com.github.nextcloud:android-library", version.ref = "androidLibraryVersion" }
android-common = { module = "com.github.nextcloud.android-common:ui", version.ref = "androidCommonLibraryVersion" }
# Dagger
dagger = { module = "com.google.dagger:dagger", version.ref = "daggerVersion" }
dagger-android = { module = "com.google.dagger:dagger-android", version.ref = "daggerVersion" }
dagger-android-support = { module = "com.google.dagger:dagger-android-support", version.ref = "daggerVersion" }
[plugins]
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

View File

@ -3242,6 +3242,11 @@
<sha256 value="9951cb91d43d916e1aa298682121c42d49c1f0280061d002f1f36ff6cb5318ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.fragment" name="fragment" version="1.5.1">
<artifact name="fragment-1.5.1.module">
<sha256 value="2a665e166553b99bb789cef517e64131059df2a9ee60c1fd76b53cba7f0b4131" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.fragment" name="fragment" version="1.5.4">
<artifact name="fragment-1.5.4.aar">
<sha256 value="bc3c2431dda42e94bb9511c587eae890d276e4aafe393a8da7b00169186dafde" origin="Generated by Gradle" reason="Artifact is not signed"/>