From 530f2e607e8716207ae15fb6cfe110a8b8a84da8 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 15 Apr 2026 13:46:39 +0200 Subject: [PATCH 1/3] Use built-in Kotlin Signed-off-by: tobiasKaminsky --- app/build.gradle.kts | 8 -------- appscan/build.gradle.kts | 1 - build.gradle.kts | 1 - gradle.properties | 6 ------ gradle/libs.versions.toml | 1 - 5 files changed, 17 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3bfd4c229c72..2d320cce6152 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,6 @@ */ @file:Suppress("UnstableApiUsage", "DEPRECATION") -import com.android.build.gradle.internal.api.ApkVariantOutputImpl import com.github.spotbugs.snom.Confidence import com.github.spotbugs.snom.Effort import com.github.spotbugs.snom.SpotBugsTask @@ -27,7 +26,6 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.spotbugs) alias(libs.plugins.detekt) // needed to make renovate run without shot, as shot requires Android SDK @@ -167,12 +165,6 @@ android { } } - applicationVariants.configureEach { - outputs.configureEach { - if (this is ApkVariantOutputImpl) this.outputFileName = "${this.baseName}-${this.versionCode}.apk" - } - } - testOptions { unitTests.isReturnDefaultValues = true animationsDisabled = true diff --git a/appscan/build.gradle.kts b/appscan/build.gradle.kts index d650a922c963..f18bf0b1bf2c 100644 --- a/appscan/build.gradle.kts +++ b/appscan/build.gradle.kts @@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.jetbrains.kotlin.android) } android { diff --git a/build.gradle.kts b/build.gradle.kts index 58549bc5001a..f58d97354593 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false - alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.spotless) apply false alias(libs.plugins.ksp) apply false diff --git a/gradle.properties b/gradle.properties index c0524e6be1ea..dd9ffff87b42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,11 +22,5 @@ org.gradle.configuration-cache=true org.gradle.workers.max=4 -# automatically aded via AGP migration -# see https://developer.android.com/build/releases/agp-9-0-0-release-notes -# should be changed with https://github.com/nextcloud/android/issues/15993 -android.builtInKotlin=false -android.newDsl=false - # Needed for local libs # org.gradle.dependency.verification=lenient diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 186850076963..272f2bbf79ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -285,7 +285,6 @@ android-application = { id = "com.android.application", version.ref = "androidPl android-library = { id = "com.android.library", version.ref = "androidPluginVersion" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } spotbugs = { id = "com.github.spotbugs", version.ref = "spotbugsGradlePlugin" } -jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } From 84ed04ad961ff8c1e56dc398def0d145c2390d3b Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 17 Apr 2026 07:13:43 +0200 Subject: [PATCH 2/3] suppress false-positive spotbugs for Dagger Signed-off-by: tobiasKaminsky --- scripts/analysis/spotbugs-filter.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/analysis/spotbugs-filter.xml b/scripts/analysis/spotbugs-filter.xml index a5ee9eb2f79c..9f1f687618cc 100644 --- a/scripts/analysis/spotbugs-filter.xml +++ b/scripts/analysis/spotbugs-filter.xml @@ -19,6 +19,9 @@ + + + From d8c62d4ff97f9c8911e946ca6e3b73d5ec85c107 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 17 Apr 2026 07:27:06 +0200 Subject: [PATCH 3/3] fix test Signed-off-by: tobiasKaminsky --- .../com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt index e3d008fcef63..e636c304bb82 100644 --- a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt +++ b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt @@ -29,6 +29,7 @@ import com.owncloud.android.MainApp import com.owncloud.android.datamodel.ArbitraryDataProvider import com.owncloud.android.datamodel.SyncedFolderProvider import com.owncloud.android.datamodel.UploadsStorageManager +import com.owncloud.android.operations.factory.UploadFileOperationFactory import com.owncloud.android.utils.theme.ViewThemeUtils import io.mockk.every import io.mockk.mockk @@ -112,6 +113,8 @@ class BackgroundJobFactoryTest { @Mock private lateinit var fileDao: FileDao + @Mock private lateinit var uploadFileOperationFactory: UploadFileOperationFactory + private lateinit var factory: BackgroundJobFactory @Before @@ -143,7 +146,8 @@ class BackgroundJobFactoryTest { { localBroadcastManager }, generatePDFUseCase, syncedFolderProvider, - db + db, + uploadFileOperationFactory ) }