Merge pull request #15444 from nextcloud/chore/dependencies-toml-2

chore: update dependencies to TOML format

Author: AndyScherzinger

app/build.gradle

@@ -67,6 +67,10 @@ configurations.configureEach {
             useVersion(checkerVersion)
             because("https://github.com/google/ExoPlayer/issues/10007")
         }
+
+        if (requested.group == "commons-logging" && requested.name == "commons-logging") {
+            useTarget("org.slf4j:jcl-over-slf4j:1.7.4")
+        }
     }
 }
 
@@ -341,31 +345,31 @@ dependencies {
     androidTestImplementation libs.core.ktx
     androidTestImplementation libs.core.testing
 
-    compileOnly "org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2"
+    compileOnly libs.org.jbundle.util.osgi.wrapped.org.apache.http.client
     // remove after entire switch to lib v2
-    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
-    implementation "org.apache.jackrabbit:jackrabbit-webdav:2.13.5" // remove after entire switch to lib v2
-    implementation "androidx.constraintlayout:constraintlayout:2.2.1"
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "com.google.android.material:material:1.12.0"
-    implementation "com.jakewharton:disklrucache:2.0.2"
-    implementation "com.github.albfernandez:juniversalchardet:2.5.0" // need this version for Android <7
-    compileOnly "com.google.code.findbugs:annotations:3.0.1u2"
-    implementation "commons-io:commons-io:2.20.0"
-    implementation "org.greenrobot:eventbus:3.3.1"
-    implementation "com.googlecode.ez-vcard:ez-vcard:0.12.1"
-    implementation "org.lukhnos:nnio:0.3.1"
-    implementation "org.bouncycastle:bcpkix-jdk18on:1.81"
-    implementation "com.google.code.gson:gson:2.13.1"
-    implementation "com.github.nextcloud-deps:sectioned-recyclerview:0.6.1"
-    implementation "com.github.Baseflow:PhotoView:2.3.0"
-    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.29"
-    implementation "com.github.nextcloud-deps:qrcodescanner:0.1.2.4" // "com.github.blikoon:QRCodeScanner:0.1.2"
-    implementation "com.google.android.flexbox:flexbox:3.0.0"
-
-    implementation "com.caverock:androidsvg:1.4"
-    implementation "androidx.annotation:annotation:1.9.1"
-    implementation "com.vanniktech:emoji-google:0.21.0"
+    implementation libs.commons.httpclient.commons.httpclient // remove after entire switch to lib v2
+    implementation libs.jackrabbit.webdav // remove after entire switch to lib v2
+    implementation libs.constraintlayout
+    implementation libs.legacy.support.v4
+    implementation libs.material
+    implementation libs.disklrucache
+    implementation libs.juniversalchardet // need this version for Android <7
+    compileOnly libs.annotations
+    implementation libs.commons.io
+    implementation libs.eventbus
+    implementation libs.ez.vcard
+    implementation libs.nnio
+    implementation libs.bcpkix.jdk18on
+    implementation libs.gson
+    implementation libs.sectioned.recyclerview
+    implementation libs.photoview
+    implementation libs.android.gif.drawable
+    implementation libs.qrcodescanner // "com.github.blikoon:QRCodeScanner:0.1.2"
+    implementation libs.flexbox
+
+    implementation libs.androidsvg
+    implementation libs.annotation
+    implementation libs.emoji.google
 
     // document scanner not available on FDroid (generic) due to OpenCV binaries
     gplayImplementation project(":appscan")
@@ -375,36 +379,37 @@ dependencies {
     spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0"
     spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.12"
 
-    implementation "com.google.dagger:dagger:$daggerVersion"
-    implementation "com.google.dagger:dagger-android:$daggerVersion"
-    implementation "com.google.dagger:dagger-android-support:$daggerVersion"
+    // 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"
 
-    implementation "org.conscrypt:conscrypt-android:2.5.3"
+    implementation libs.conscrypt.android
 
-    implementation "me.zhanghai.android.fastscroll:library:1.3.0"
+    implementation libs.library
 
     // Shimmer animation
-    implementation "io.github.elye:loaderviewlibrary:3.0.0"
+    implementation libs.loaderviewlibrary
 
     // dependencies for markdown rendering
-    implementation "io.noties.markwon:core:$markwonVersion"
-    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
-    implementation "io.noties.markwon:ext-tables:$markwonVersion"
-    implementation "io.noties.markwon:ext-tasklist:$markwonVersion"
-    implementation "io.noties.markwon:html:$markwonVersion"
-
-    implementation "io.noties.markwon:syntax-highlight:$markwonVersion"
-    implementation "io.noties:prism4j:$prismVersion"
+    implementation libs.core
+    implementation libs.ext.strikethrough
+    implementation libs.ext.tables
+    implementation libs.ext.tasklist
+    implementation libs.html
+
+    implementation libs.syntax.highlight
+    implementation libs.prism4j
     kapt "io.noties:prism4j-bundler:$prismVersion"
 
     // dependencies for image cropping and rotation
-    implementation "com.vanniktech:android-image-cropper:4.6.0"
+    implementation libs.android.image.cropper
 
-    implementation "org.osmdroid:osmdroid-android:6.1.20"
+    implementation libs.osmdroid.android
 
-    implementation("org.mnode.ical4j:ical4j:3.2.19") {
+    implementation(libs.ical4j) {
         ["org.apache.commons", "commons-logging"].each {
             exclude group: "$it"
         }
@@ -415,40 +420,40 @@ dependencies {
     }
 
     // dependencies for local unit tests
-    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "androidx.test:core:$androidxTestVersion"
-    testImplementation "org.json:json:20250517"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
+    testImplementation libs.junit.junit
+    testImplementation libs.mockito.core
+    testImplementation libs.test.core
+    testImplementation libs.json
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.core.testing
     testImplementation "io.mockk:mockk:$mockkVersion"
-    testImplementation "io.mockk:mockk-android:$mockkVersion"
+    testImplementation libs.mockk.android
 
     // Mocking support
-    androidTestImplementation "com.github.tmurakami:dexopener:2.0.5" // required to allow mocking on API 27 and older
-    androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-    androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
-    androidTestImplementation("org.mockito:mockito-android:$mockitoVersion")
-    androidTestImplementation "io.mockk:mockk-android:$mockkVersion"
-    androidTestImplementation "com.facebook.testing.screenshot:core:0.15.0"
+    androidTestImplementation libs.dexopener // required to allow mocking on API 27 and older
+    androidTestImplementation libs.mockito.kotlin
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation(libs.mockito.android)
+    androidTestImplementation libs.mockk.android
+    androidTestImplementation libs.screenshot.core
 
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
     // androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
     // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
     //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
-    androidTestImplementation "tools.fastlane:screengrab:2.1.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    androidTestImplementation libs.screengrab
+    implementation libs.kotlin.stdlib
 
-    implementation "com.github.stateless4j:stateless4j:2.6.0"
+    implementation libs.stateless4j
 
     // upon each update first test: new registration, receive push
-    gplayImplementation "com.google.firebase:firebase-messaging:25.0.0"
-    gplayImplementation "com.google.android.gms:play-services-base:18.7.2"
-    gplayImplementation "com.google.android.play:review-ktx:2.0.2"
+    gplayImplementation libs.firebase.messaging
+    gplayImplementation libs.play.services.base
+    gplayImplementation libs.review.ktx
 
-    implementation "com.github.nextcloud.android-common:ui:$androidCommonLibraryVersion"
+    implementation libs.ui
 
-    implementation "io.coil-kt:coil:2.7.0"
+    implementation libs.coil
 }
 
 configurations.configureEach {

gradle/libs.versions.toml

@@ -2,31 +2,130 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 [versions]
+androidCommonLibraryVersion = "0.27.2"
+androidGifDrawableVersion = "1.2.29"
+androidImageCropperVersion = "4.6.0"
+androidsvgVersion = "1.4"
 androidxTestVersion = "1.7.0"
+annotationsVersion = "3.0.1u2"
+annotationVersion = "1.9.1"
 appCompatVersion = "1.7.1"
+bcpkixJdk18onVersion = "1.81"
 cardviewVersion = "1.0.0"
+coilVersion = "2.7.0"
+commonsHttpclient = "3.1"
+commonsIoVersion = "2.20.0"
+conscryptAndroidVersion = "2.5.3"
+constraintlayoutVersion = "2.2.1"
 coreTestingVersion = "2.2.0"
+coreVersion = "0.15.0"
+daggerVersion = "2.57.1"
+dexopenerVersion = "2.0.5"
+disklrucacheVersion = "2.0.2"
+emojiGoogleVersion = "0.21.0"
 espressoVersion = "3.7.0"
+eventbusVersion = "3.3.1"
 exifinterfaceVersion = "1.4.1"
+ezVcardVersion = "0.12.1"
+firebaseMessagingVersion = "25.0.0"
+flexboxVersion = "3.0.0"
 fragmentKtxVersion = "1.8.9"
 glide = "4.16.0"
+gsonVersion = "2.13.1"
+ical4jVersion = "3.2.19"
+jackrabbitWebdavVersion = "2.13.5"
+jsonVersion = "20250517"
+junit = "4.13.2"
 junitVersion = "1.3.0"
+juniversalchardetVersion = "2.5.0"
+kotlinStdlibVersion = "2.2.10"
+legacySupportV4Version = "1.0.0"
+libraryVersion = "1.3.0"
 lifecycleViewmodelKtxVersion = "2.9.2"
+loaderviewlibraryVersion = "3.0.0"
+markwonVersion = "4.6.2"
+materialVersion = "1.12.0"
 media3 = "1.8.0"
+mockitoKotlinVersion = "4.1.0"
+mockitoVersion = "4.11.0"
+mockkVersion = "1.14.5"
+nnioVersion = "0.3.1"
 orchestratorVersion = "1.6.1"
+orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion = "4.1.2"
+osmdroidAndroidVersion = "6.1.20"
+photoviewVersion = "2.3.0"
+playServicesBaseVersion = "18.7.2"
+prismVersion = "2.0.0"
+qrcodescannerVersion = "0.1.2.4"
+reviewKtxVersion = "2.0.2"
 roomVersion = "2.7.2"
+screengrabVersion = "2.1.1"
+sectionedRecyclerviewVersion = "0.6.1"
 splash-screen = "1.0.1"
 kotlin = "2.2.10"
 composeBom = "2025.08.00"
 spotbugsGradlePlugin = "6.2.3"
 detektGradlePlugin = "1.23.8"
 spotless = "7.2.1"
 ksp = "2.2.10-2.0.2"
+stateless4jVersion = "2.6.0"
 webkitVersion = "1.14.0"
 workRuntime = "2.10.3"
 
 [libraries]
 # Splash Screen
+android-gif-drawable = { module = "pl.droidsonroids.gif:android-gif-drawable", version.ref = "androidGifDrawableVersion" }
+android-image-cropper = { module = "com.vanniktech:android-image-cropper", version.ref = "androidImageCropperVersion" }
+androidsvg = { module = "com.caverock:androidsvg", version.ref = "androidsvgVersion" }
+annotation = { module = "androidx.annotation:annotation", version.ref = "annotationVersion" }
+annotations = { module = "com.google.code.findbugs:annotations", version.ref = "annotationsVersion" }
+bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkixJdk18onVersion" }
+coil = { module = "io.coil-kt:coil", version.ref = "coilVersion" }
+commons-httpclient-commons-httpclient = { module = "commons-httpclient:commons-httpclient", version.ref = "commonsHttpclient" }
+commons-io = { module = "commons-io:commons-io", version.ref = "commonsIoVersion" }
+conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroidVersion" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayoutVersion" }
+core = { module = "io.noties.markwon:core", version.ref = "markwonVersion" }
+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" }
+dexopener = { module = "com.github.tmurakami:dexopener", version.ref = "dexopenerVersion" }
+disklrucache = { module = "com.jakewharton:disklrucache", version.ref = "disklrucacheVersion" }
+emoji-google = { module = "com.vanniktech:emoji-google", version.ref = "emojiGoogleVersion" }
+eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbusVersion" }
+ext-strikethrough = { module = "io.noties.markwon:ext-strikethrough", version.ref = "markwonVersion" }
+ext-tables = { module = "io.noties.markwon:ext-tables", version.ref = "markwonVersion" }
+ext-tasklist = { module = "io.noties.markwon:ext-tasklist", version.ref = "markwonVersion" }
+ez-vcard = { module = "com.googlecode.ez-vcard:ez-vcard", version.ref = "ezVcardVersion" }
+firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebaseMessagingVersion" }
+flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexboxVersion" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gsonVersion" }
+html = { module = "io.noties.markwon:html", version.ref = "markwonVersion" }
+ical4j = { module = "org.mnode.ical4j:ical4j", version.ref = "ical4jVersion" }
+jackrabbit-webdav = { module = "org.apache.jackrabbit:jackrabbit-webdav", version.ref = "jackrabbitWebdavVersion" }
+json = { module = "org.json:json", version.ref = "jsonVersion" }
+junit-junit = { module = "junit:junit", version.ref = "junit" }
+juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardetVersion" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinStdlibVersion" }
+legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4Version" }
+library = { module = "me.zhanghai.android.fastscroll:library", version.ref = "libraryVersion" }
+loaderviewlibrary = { module = "io.github.elye:loaderviewlibrary", version.ref = "loaderviewlibraryVersion" }
+material = { module = "com.google.android.material:material", version.ref = "materialVersion" }
+mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockitoVersion" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoVersion" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlinVersion" }
+mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockkVersion" }
+nnio = { module = "org.lukhnos:nnio", version.ref = "nnioVersion" }
+org-jbundle-util-osgi-wrapped-org-apache-http-client = { module = "org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client", version.ref = "orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion" }
+osmdroid-android = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroidVersion" }
+photoview = { module = "com.github.Baseflow:PhotoView", version.ref = "photoviewVersion" }
+play-services-base = { module = "com.google.android.gms:play-services-base", version.ref = "playServicesBaseVersion" }
+prism4j = { module = "io.noties:prism4j", version.ref = "prismVersion" }
+qrcodescanner = { module = "com.github.nextcloud-deps:qrcodescanner", version.ref = "qrcodescannerVersion" }
+review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "reviewKtxVersion" }
+screengrab = { module = "tools.fastlane:screengrab", version.ref = "screengrabVersion" }
+screenshot-core = { module = "com.facebook.testing.screenshot:core", version.ref = "coreVersion" }
+sectioned-recyclerview = { module = "com.github.nextcloud-deps:sectioned-recyclerview", version.ref = "sectionedRecyclerviewVersion" }
 splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splash-screen" }
 
 # UI
@@ -82,6 +181,10 @@ runner = { module = "androidx.test:runner", version.ref = "androidxTestVersion"
 spotbugs-gradle-plugin = { module = "com.github.spotbugs.snom:spotbugs-gradle-plugin", version.ref = "spotbugsGradlePlugin" }
 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" }
+stateless4j = { module = "com.github.stateless4j:stateless4j", version.ref = "stateless4jVersion" }
+syntax-highlight = { module = "io.noties.markwon:syntax-highlight", version.ref = "markwonVersion" }
+test-core = { module = "androidx.test:core", version.ref = "androidxTestVersion" }
+ui = { module = "com.github.nextcloud.android-common:ui", version.ref = "androidCommonLibraryVersion" }
 webkit = { module = "androidx.webkit:webkit", version.ref = "webkitVersion" }
 work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRuntime" }
 work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntime" }

gradle/verification-metadata.xml

@@ -20261,6 +20261,11 @@
             <sha256 value="c01c4cda5e408f41ed1d83e4a0a170cf53801b6338aba49f0f904786bc1214fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.2">
+         <artifact name="commons-codec-1.2.pom">
+            <sha256 value="28d6c089355487fd2e973e091a152727ac27ad2b2c1ec9cbcf916a10fc863148" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-collections" name="commons-collections" version="3.2.2">
          <artifact name="commons-collections-3.2.2.jar">
             <sha256 value="eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8" origin="Generated by Gradle"/>
@@ -20350,6 +20355,14 @@
             <sha256 value="0c23863893a2291f5a7afdbd8d15923b3948afd87e563fa341cdcf6eae338a60" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-logging" name="commons-logging" version="1.0.4">
+         <artifact name="commons-logging-1.0.4.jar">
+            <sha256 value="e94af49749384c11f5aa50e8d0f5fe679be771295b52030338d32843c980351e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-logging-1.0.4.pom">
+            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.jar">
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>