Skip to content

Use built-in Kotlin #16855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 3 commits into from
Apr 17, 2026
Merged

Use built-in Kotlin #16855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
530f2e6
Use built-in Kotlin
tobiasKaminsky Apr 15, 2026
84ed04a
suppress false-positive spotbugs for Dagger
tobiasKaminsky Apr 17, 2026
d8c62d4
fix test
tobiasKaminsky Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -167,12 +165,6 @@ android {
}
}

applicationVariants.configureEach {
outputs.configureEach {
if (this is ApkVariantOutputImpl) this.outputFileName = "${this.baseName}-${this.versionCode}.apk"

@tobiasKaminsky tobiasKaminsky Apr 15, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we do not need it.
Since there was no easy migration, I simply removed it.

}
}

testOptions {
unitTests.isReturnDefaultValues = true
animationsDisabled = true
Expand Down
6 changes: 5 additions & 1 deletion app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -112,6 +113,8 @@ class BackgroundJobFactoryTest {

@Mock private lateinit var fileDao: FileDao

@Mock private lateinit var uploadFileOperationFactory: UploadFileOperationFactory

private lateinit var factory: BackgroundJobFactory

@Before
Expand Down Expand Up @@ -143,7 +146,8 @@ class BackgroundJobFactoryTest {
{ localBroadcastManager },
generatePDFUseCase,
syncedFolderProvider,
db
db,
uploadFileOperationFactory
)
}

Expand Down
1 change: 0 additions & 1 deletion appscan/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrains.kotlin.android)
}

android {
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
3 changes: 3 additions & 0 deletions scripts/analysis/spotbugs-filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<Match>
<Class name="~.*\$\$Parcelable.*" />
</Match>
<Match>
<Class name="~.*\$appFactory.*" />
</Match>

<!-- Dagger code is autogenerated. Exclude it from Check. -->
<Match>
Expand Down
Loading