diff --git a/app/build.gradle b/app/build.gradle
index eeb1e7aec7..0681934303 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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"
}
diff --git a/appscan/build.gradle b/appscan/build.gradle
index 012f63009c..a876e6aefe 100644
--- a/appscan/build.gradle
+++ b/appscan/build.gradle
@@ -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
}
diff --git a/build.gradle b/build.gradle
index 7555c7e33b..10c75b9b7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,6 @@
*/
buildscript {
ext {
- androidLibraryVersion ="8e561c7e65f208492c20b106eb25cfbe43dc7189"
- androidCommonLibraryVersion = "0.25.0"
androidPluginVersion = "8.9.2"
androidxMediaVersion = "1.5.1"
androidxTestVersion = "1.6.1"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 03f00ff85e..f4b51badf9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d7da67a849..5ab1cc7298 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3242,6 +3242,11 @@
+
+
+
+
+