added DEV version to repo

app/.gitignore

@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 /build

app/build.gradle

@@ -2,11 +2,11 @@
  * Nextcloud - Android Client
  *
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
+ * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
  * SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger.de>
  * SPDX-FileCopyrightText: 2022 Álvaro Brey Vilas <alvaro@alvarobrey.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 import com.github.spotbugs.snom.Confidence
 import com.github.spotbugs.snom.Effort
@@ -16,11 +16,11 @@ import org.gradle.internal.jvm.Jvm
 buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.12'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
-        classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
-        classpath 'com.karumi:shot:6.1.0'
+        classpath libs.spotbugs.gradle.plugin
+        classpath libs.kotlin.gradle.plugin
+        classpath libs.detekt.gradle.plugin
+        classpath libs.commons.httpclient.commons.httpclient // remove after entire switch to lib v2
+        classpath libs.shot
         classpath "org.jacoco:org.jacoco.core:$jacoco_version"
         classpath "org.jacoco:org.jacoco.report:$jacoco_version"
         classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
@@ -28,40 +28,35 @@ buildscript {
 }
 
 plugins {
-    id "com.diffplug.spotless" version "6.20.0"
-    id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.kapt)
+    alias(libs.plugins.ksp) apply false
 }
 
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'checkstyle'
-apply plugin: 'pmd'
+apply plugin: "kotlin-android"
+apply plugin: "kotlin-parcelize"
+apply plugin: "checkstyle"
+apply plugin: "pmd"
 apply from: "$rootProject.projectDir/jacoco.gradle"
-apply plugin: 'com.github.spotbugs'
-apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: "com.github.spotbugs"
+apply plugin: "io.gitlab.arturbosch.detekt"
 
 // needed to make renovate run without shot, as shot requires Android SDK
 // https://github.com/pedrovgs/Shot/issues/300
 if (shotTest) {
-    apply plugin: 'shot'
+    apply plugin: "shot"
 }
-apply plugin: 'com.google.devtools.ksp'
+apply plugin: "com.google.devtools.ksp"
 
 
 println "Gradle uses Java ${Jvm.current()}"
 
 configurations {
     configureEach {
-        exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly
-
-        // check for updates every build
-        resolutionStrategy {
-            cacheChangingModulesFor 0, 'seconds'
-            exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
-        }
+        exclude group: "org.jetbrains", module: "annotations-java5" // via prism4j, already using annotations explicitly
     }
 }
 
@@ -72,39 +67,59 @@ 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")
+        }
     }
 }
 
 // semantic versioning for version code
 def versionMajor = 3
-def versionMinor = 29
-def versionPatch = 3
-def versionBuild = 90 // 0-50=Alpha / 51-98=RC / 90-99=stable
+def versionMinor = 35
+def versionPatch = 0
+def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
+
 
 def ndkEnv = new HashMap<String, String>()
 file("$project.rootDir/ndk.env").readLines().each() {
-    def (key, value) = it.tokenize('=')
+    def (key, value) = it.tokenize("=")
     ndkEnv.put(key, value)
 }
 
-def perfAnalysis = project.hasProperty('perfAnalysis')
+def perfAnalysis = project.hasProperty("perfAnalysis")
+
+def getConfigProperties() {
+    def props = new Properties()
+    def file = rootProject.file(".gradle/config.properties")
+    if (file.exists()) {
+        props.load(new FileInputStream(file))
+    }
+    return props
+}
+
+def configProps = getConfigProperties()
 
 android {
     // install this NDK version and Cmake to produce smaller APKs. Build will still work if not installed
-    ndkVersion "${ndkEnv.get("NDK_VERSION")}"
+    ndkVersion = "${ndkEnv.get("NDK_VERSION")}"
 
 
-    namespace 'com.owncloud.android'
-    testNamespace "${namespace}.test"
+    namespace = "com.owncloud.android"
+    testNamespace = "${namespace}.test"
 
+    androidResources {
+        generateLocaleConfig = true
+    }
 
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 34
-        compileSdk 34
+        applicationId = "com.nextcloud.client"
+        minSdk = 27
+        targetSdk = 35
+        compileSdk = 35
 
-        buildConfigField 'boolean', 'CI', ciBuild.toString()
-        buildConfigField 'boolean', 'RUNTIME_PERF_ANALYSIS', perfAnalysis.toString()
+        buildConfigField "boolean", "CI", ciBuild.toString()
+        buildConfigField "boolean", "RUNTIME_PERF_ANALYSIS", perfAnalysis.toString()
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -121,7 +136,7 @@ android {
         testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
         testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}"
         testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"
-        testInstrumentationRunnerArguments disableAnalytics: 'true'
+        testInstrumentationRunnerArguments disableAnalytics: "true"
 
         versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
 
@@ -139,8 +154,15 @@ android {
         flavorDimensions += "default"
 
         buildTypes {
+            release {
+                buildConfigField "String", "NC_TEST_SERVER_DATA_STRING", "\"\""
+            }
+
             debug {
-                testCoverageEnabled(project.hasProperty('coverage'))
+                testCoverageEnabled = project.hasProperty("coverage")
+                resConfigs "xxxhdpi"
+
+                buildConfigField "String", "NC_TEST_SERVER_DATA_STRING", "\"nc://login/user:${configProps['NC_TEST_SERVER_USERNAME']}&password:${configProps['NC_TEST_SERVER_PASSWORD']}&server:${configProps['NC_TEST_SERVER_BASEURL']}\""
             }
         }
 
@@ -151,17 +173,17 @@ android {
         productFlavors {
             // used for f-droid
             generic {
-                applicationId 'com.nextcloud.client'
+                applicationId "com.nextcloud.client"
                 dimension "default"
             }
 
             gplay {
-                applicationId 'com.nextcloud.client'
+                applicationId "com.nextcloud.client"
                 dimension "default"
             }
 
             huawei {
-                applicationId 'com.nextcloud.client'
+                applicationId "com.nextcloud.client"
                 dimension "default"
             }
 
@@ -180,10 +202,9 @@ android {
             }
         }
 
-
         testOptions {
             unitTests.returnDefaultValues = true
-            animationsDisabled true
+            animationsDisabled = true
         }
     }
 
@@ -191,17 +212,18 @@ android {
     // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
     packagingOptions {
         resources {
-            excludes += 'META-INF/LICENSE*'
-            pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
+            excludes += "META-INF/LICENSE*"
+            excludes += "META-INF/versions/9/OSGI-INF/MANIFEST*"
+            pickFirst "MANIFEST.MF" // workaround for duplicated manifest on some dependencies
         }
     }
 
     tasks.register("checkstyle", Checkstyle) {
         configFile = file("${rootProject.projectDir}/checkstyle.xml")
         configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath
-        source 'src'
-        include '**/*.java'
-        exclude '**/gen/**'
+        source "src"
+        include "**/*.java"
+        exclude "**/gen/**"
         classpath = files()
     }
 
@@ -210,26 +232,26 @@ android {
         ignoreFailures = true // should continue checking
         ruleSets = []
 
-        source 'src'
-        include '**/*.java'
-        exclude '**/gen/**'
+        source "src"
+        include "**/*.java"
+        exclude "**/gen/**"
 
         reports {
             xml {
-                destination = file("$project.buildDir/reports/pmd/pmd.xml")
+                destination = layout.buildDirectory.file("reports/pmd/pmd.xml").get().asFile
             }
             html {
-                destination = file("$project.buildDir/reports/pmd/pmd.html")
+                destination = layout.buildDirectory.file("reports/pmd/pmd.html").get().asFile
             }
         }
     }
 
-    check.dependsOn 'checkstyle', 'spotbugsGplayDebug', 'pmd', 'lint', 'spotlessKotlinCheck', 'detekt'
+    check.dependsOn "checkstyle", "spotbugsGplayDebug", "pmd", "lint", "spotlessKotlinCheck", "detekt"
 
     buildFeatures {
-        dataBinding true
-        viewBinding true
-        aidl true
+        dataBinding = true
+        viewBinding = true
+        aidl = true
         compose = true
     }
 
@@ -243,11 +265,11 @@ android {
     }
 
     lint {
-        abortOnError false
-        checkGeneratedSources true
-        disable 'MissingTranslation', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities', 'GoogleAppIndexingWarning', 'MissingDefaultResource', 'InvalidPeriodicWorkRequestInterval', 'StringFormatInvalid', 'MissingQuantity'
-        htmlOutput file("$project.buildDir/reports/lint/lint.html")
-        htmlReport true
+        abortOnError = false
+        checkGeneratedSources = true
+        disable "MissingTranslation", "GradleDependency", "VectorPath", "IconMissingDensityFolder", "IconDensities", "GoogleAppIndexingWarning", "MissingDefaultResource", "InvalidPeriodicWorkRequestInterval", "StringFormatInvalid", "MissingQuantity"
+        htmlOutput = layout.buildDirectory.file("reports/lint/lint.html").get().asFile
+        htmlReport = true
     }
 
     sourceSets {
@@ -255,189 +277,251 @@ android {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
+    kapt {
+        useBuildCache = true
     }
 }
 
 dependencies {
+    // region Nextcloud library
     implementation("com.github.nextcloud:android-library:$androidLibraryVersion") {
-        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
+        exclude group: "org.ogce", module: "xpp3" // unused in Android and brings wrong Junit version
     }
+    // endregion
 
-    // Jetpack Compose
-    implementation(platform("androidx.compose:compose-bom:2024.04.00"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.material3:material3")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.6.5")
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5'
+    // region Splash Screen
+    implementation libs.splashscreen
+    // 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
-    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.1.4'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'com.jakewharton:disklrucache:2.0.2'
-    implementation "androidx.appcompat:appcompat:$appCompatVersion"
-    implementation 'androidx.webkit:webkit:1.10.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.3.7'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1"
-    implementation "androidx.lifecycle:lifecycle-service:2.8.1"
-    implementation "androidx.work:work-runtime:$workRuntime"
-    implementation "androidx.work:work-runtime-ktx:$workRuntime"
-    implementation "androidx.fragment:fragment-ktx:1.6.2"
-    implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
-    compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
-    implementation 'commons-io:commons-io:2.16.1'
-    implementation 'org.greenrobot:eventbus:3.3.1'
-    implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1'
-    implementation 'org.lukhnos:nnio:0.3'
-    implementation 'org.bouncycastle:bcpkix-jdk18on:1.77'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1'
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.28'
-    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.github.bumptech.glide:glide:3.8.0') {
-        exclude group: "com.android.support"
-    }
-    implementation 'com.caverock:androidsvg:1.4'
-    implementation 'androidx.annotation:annotation:1.7.1'
-    implementation 'com.vanniktech:emoji-google:0.18.0'
+    // 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
 
-    implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
-    implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"
+    // region Media3
+    implementation libs.media3.ui
+    implementation libs.media3.session
+    implementation libs.media3.exoplayer
+    implementation libs.media3.datasource
+    // endregion
 
-    // document scanner not available on FDroid (generic) due to OpenCV binaries
-    gplayImplementation project(':appscan')
-    huaweiImplementation project(':appscan')
-    qaImplementation project(':appscan')
+    // region Room
+    implementation libs.room.runtime
+    ksp "androidx.room:room-compiler:$roomVersion"
+    androidTestImplementation libs.room.testing
+    // endregion
 
-    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0'
-    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.4'
+    // 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
 
-    implementation "com.google.dagger:dagger:$daggerVersion"
-    implementation "com.google.dagger:dagger-android:$daggerVersion"
-    implementation "com.google.dagger:dagger-android-support:$daggerVersion"
+    // region Glide
+    implementation libs.glide
+    ksp libs.ksp
+    // endregion
+
+    // region UI
+    implementation libs.appcompat
+    implementation libs.webkit
+    implementation libs.cardview
+    implementation libs.exifinterface
+    implementation libs.fragment.ktx
+    // endregion
+
+    // region Worker
+    implementation libs.work.runtime
+    implementation libs.work.runtime.ktx
+    // endregion
+
+    // region Lifecycle
+    implementation libs.lifecycle.viewmodel.ktx
+    implementation libs.lifecycle.service
+    implementation(libs.lifecycle.runtime.ktx)
+    // endregion
+
+    // region JUnit
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.rules
+    androidTestImplementation libs.runner
+    androidTestUtil libs.orchestrator
+    androidTestImplementation libs.core.ktx
+    androidTestImplementation libs.core.testing
+    // endregion
+
+    // region other libraries
+    compileOnly libs.org.jbundle.util.osgi.wrapped.org.apache.http.client
+    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
+    // endregion
+
+    // region AppScan, document scanner not available on FDroid (generic) due to OpenCV binaries
+    gplayImplementation project(":appscan")
+    huaweiImplementation project(":appscan")
+    qaImplementation project(":appscan")
+    // endregion
+
+    // region SpotBugs
+    spotbugsPlugins libs.findsecbugs.plugin
+    spotbugsPlugins libs.fb.contrib
+    // 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
 
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+    // region Crypto
+    implementation libs.conscrypt.android
+    // endregion
 
-    implementation "androidx.media3:media3-ui:$androidxMediaVersion"
-    implementation "androidx.media3:media3-exoplayer:$androidxMediaVersion"
-    implementation "androidx.media3:media3-datasource-okhttp:$androidxMediaVersion"
+    // region Library
+    implementation libs.library
+    // endregion
 
-    implementation 'me.zhanghai.android.fastscroll:library:1.3.0'
+    // region Shimmer
+    implementation libs.loaderviewlibrary
+    // endregion
 
-    // Shimmer animation
-    implementation 'io.github.elye:loaderviewlibrary:3.0.0'
-
-    // 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"
+    // region Markdown rendering
+    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"
+    // endregion
 
-    // dependencies for image cropping and rotation
-    implementation 'com.vanniktech:android-image-cropper:4.5.0'
+    // region Image cropping / rotation
+    implementation libs.android.image.cropper
+    // endregion
 
-    implementation 'org.osmdroid:osmdroid-android:6.1.18'
+    // region Maps
+    implementation libs.osmdroid.android
+    // endregion
 
-    implementation('org.mnode.ical4j:ical4j:3.0.0') {
-        ['org.apache.commons', 'commons-logging'].each {
+    // region iCal4j
+    implementation(libs.ical4j) {
+        ["org.apache.commons", "commons-logging"].each {
             exclude group: "$it"
         }
     }
+    // endregion
 
+    // region LeakCanary
     if (perfAnalysis) {
-        debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+        debugImplementation "com.squareup.leakcanary:leakcanary-android:2.14"
     }
+    // endregion
 
-    // 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:20240303'
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-    testImplementation 'androidx.arch.core:core-testing:2.2.0'
+    // region Local Unit Test
+    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
+    // endregion
 
-    // dependencies for instrumented tests
-    // JUnit4 Rules
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation "androidx.test:rules:$androidxTestVersion"
-    // Android JUnit Runner
-    androidTestImplementation "androidx.test:runner:1.5.2"
-    androidTestUtil "androidx.test:orchestrator:1.4.2"
-    androidTestImplementation "androidx.test:core-ktx:$androidxTestVersion"
-
-    // Espresso
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-accessibility:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
-
-    // 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 'androidx.arch.core:core-testing:2.2.0'
-    androidTestImplementation "com.facebook.testing.screenshot:core:0.15.0"
+    // region Mocking support
+    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
+    // endregion
 
+    // region UIAutomator
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
-    // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    // 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 "com.android.support:support-annotations:${supportLibraryVersion}"
+    androidTestImplementation libs.screengrab
+    // endregion
 
-    implementation "com.github.stateless4j:stateless4j:2.6.0"
+    // region Kotlin
+    implementation libs.kotlin.stdlib
+    // endregion
 
-    // upon each update first test: new registration, receive push
-    gplayImplementation "com.google.firebase:firebase-messaging:23.4.1"
-    gplayImplementation 'com.google.android.play:review-ktx:2.0.1'
+    // region Stateless
+    implementation libs.stateless4j
+    // endregion
 
-    implementation 'com.github.nextcloud.android-common:ui:0.17.0'
+    // region Google Play dependencies, upon each update first test: new registration, receive push
+    gplayImplementation libs.firebase.messaging
+    gplayImplementation libs.play.services.base
+    gplayImplementation libs.review.ktx
+    // endregion
 
-    implementation "androidx.room:room-runtime:$roomVersion"
-    ksp "androidx.room:room-compiler:$roomVersion"
-    androidTestImplementation "androidx.room:room-testing:$roomVersion"
+    // region UI
+    implementation libs.ui
+    // endregion
 
-    implementation "io.coil-kt:coil:2.6.0"
-
-    // splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
-    implementation 'androidx.core:core-splashscreen:1.0.1'
+    // region Image loading
+    implementation libs.coil
+    // endregion
 }
 
+
 configurations.configureEach {
     resolutionStrategy {
-        cacheChangingModulesFor 0, 'seconds'
-        force 'org.objenesis:objenesis:3.3'
+        force "org.objenesis:objenesis:3.4"
         eachDependency { details ->
-            if ('org.jacoco' == details.requested.group) {
+            if ("org.jacoco" == details.requested.group) {
                 details.useVersion "$jacoco_version"
             }
         }
     }
 }
 
+// Run the compiler as a separate process
+tasks.withType(JavaCompile).configureEach {
+    options.fork = true
+
+    // Enable Incremental Compilation
+    options.incremental = true
+}
+
 tasks.withType(Test).configureEach {
+    // Run tests in parallel
+    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+
     // increased logging for tests
     testLogging {
         events "passed", "skipped", "failed"
@@ -465,7 +549,7 @@ if (shotTest) {
         showOnlyFailingTestsInReports = ciBuild
         // CI environment renders some shadows slightly different from local VMs
         // Add a 0.5% tolerance to account for that
-        tolerance = ciBuild ? 0.5 : 0
+        tolerance = ciBuild ? 0.1 : 0
     }
 }
 
@@ -476,7 +560,7 @@ jacoco {
 spotbugs {
     ignoreFailures = true // should continue checking
     effort = Effort.MAX
-    reportLevel = Confidence.valueOf('MEDIUM')
+    reportLevel = Confidence.valueOf("MEDIUM")
 }
 
 tasks.withType(SpotBugsTask){task ->
@@ -484,7 +568,7 @@ tasks.withType(SpotBugsTask){task ->
     String variantName = variantNameCap.substring(0, 1).toLowerCase() + variantNameCap.substring(1)
     dependsOn "compile${variantNameCap}Sources"
 
-    classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/")
+    classes = fileTree(layout.buildDirectory.get().asFile.toString()+"/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/")
     excludeFilter = file("${project.rootDir}/scripts/analysis/spotbugs-filter.xml")
     reports {
         xml {
@@ -492,12 +576,12 @@ tasks.withType(SpotBugsTask){task ->
         }
         html {
             required = true
-            outputLocation = file("$project.buildDir/reports/spotbugs/spotbugs.html")
-            stylesheet = 'fancy.xsl'
+            outputLocation = layout.buildDirectory.file("reports/spotbugs/spotbugs.html").get().asFile
+            stylesheet = "fancy.xsl"
         }
     }
 }
 
 ksp {
-    arg('room.schemaLocation', "$projectDir/schemas")
+    arg("room.schemaLocation", "$projectDir/schemas")
 }

app/detekt.yml

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 build:
   maxIssues: 2
   weights:

app/lint.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Nextcloud Talk - Android Client
+  ~ Nextcloud - Android Client
   ~ 
   ~ SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
   ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger <info@andy-scherzinger.de>
   ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
   ~ SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 <lint>
     <issue id="UnusedAttribute">
@@ -22,13 +22,17 @@
     <issue id="UnusedResources">
         <ignore regexp="store_short_desc|store_full_desc|store_short_dev_desc|store_full_dev_desc" />
         <ignore
-            regexp="screenshot_01_gridView|screenshot_02_listView|screenshot_03_drawer|screenshot_04_accounts|screenshot_05_autoUpload|screenshot_06_davdroid"/>
-        <ignore path="**/raw/encryption_key_words.txt" />
+            regexp="screenshot_01_gridView|screenshot_02_listView|screenshot_03_drawer|screenshot_04_accounts|screenshot_05_autoUpload|screenshot_06_davdroid" />
+        <ignore path="**/drawable/zdc_*.xml" />
+		<ignore path="**/drawable/iconclose.xml" />
+    </issue>
+
+    <issue id="ImpliedQuantity">
+        <ignore path="**/values-**/strings.xml" />
     </issue>
 
     <issue id="MissingQuantity">
-        <ignore path="**/values-ka-rGE/strings.xml"/>
-        <ignore path="**/values-ar/strings.xml" />
+        <ignore path="**/values-**/strings.xml" />
     </issue>
 
     <issue id="UnusedQuantity">
@@ -56,7 +60,7 @@
 
     <issue id="TrustAllX509TrustManager">
         <ignore path="**/bouncycastle/est/jcajce/*.class" />
-        <ignore path="**/bcpkix-jdk15to18-1.72.jar" />
+        <ignore path="**/bcpkix-jdk15to18-1.**.jar" />
         <ignore path="**/bcpkix-jdk18on-1.**.jar" />
     </issue>
 
@@ -77,4 +81,8 @@
         <ignore path="**/jetified-firebase-installations**/**/lint.jar" />
         <ignore path="**/appcompat-1.**/**/lint.jar" />
     </issue>
+
+	<issue id="Aligned16KB">
+        <ignore path="**/arm64-v8a/libmockkjvmtiagent.so" />
+    </issue>
 </lint>

app/schemas/com.nextcloud.client.database.NextcloudDatabase/81.json

@@ -1206,4 +1206,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '082a63031678a67879428f688f02d3b5')"
     ]
   }
-}
+}