Skip to content

Commit 0e1de81

Browse files
committed
chore: cleanup
1 parent 3d6da37 commit 0e1de81

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

app/build.gradle.kts

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ android {
8484
keyPassword = "android"
8585
}
8686
create("release") {
87-
val keystoreFile =
88-
keystoreProperties
89-
.getProperty("storeFile")
90-
.takeIf { it.isNotBlank() }
91-
?.let { rootProject.file(it) }
87+
val keystoreFile = keystoreProperties.getProperty("storeFile").takeIf { it.isNotBlank() }
88+
?.let { rootProject.file(it) }
9289
storeFile = if (keystoreFile?.exists() == true) keystoreFile else null
9390
// storeFile = rootProject.file(keystoreProperties.getProperty("storeFile"))
9491
storePassword = keystoreProperties.getProperty("storePassword")
@@ -100,7 +97,7 @@ android {
10097
debug {
10198
signingConfig = signingConfigs.getByName("debug")
10299
ndk {
103-
//noinspection ChromeOsAbiSupport
100+
// noinspection ChromeOsAbiSupport
104101
abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86_64")
105102
}
106103
}
@@ -113,7 +110,7 @@ android {
113110
)
114111
signingConfig = signingConfigs.getByName("release")
115112
ndk {
116-
//noinspection ChromeOsAbiSupport
113+
// noinspection ChromeOsAbiSupport
117114
abiFilters += listOf("armeabi-v7a", "arm64-v8a")
118115
}
119116
}
@@ -175,11 +172,10 @@ protobuf {
175172
}
176173

177174
composeCompiler {
178-
featureFlags =
179-
setOf(
180-
ComposeFeatureFlag.StrongSkipping.disabled(),
181-
ComposeFeatureFlag.OptimizeNonSkippingGroups,
182-
)
175+
featureFlags = setOf(
176+
ComposeFeatureFlag.StrongSkipping.disabled(),
177+
ComposeFeatureFlag.OptimizeNonSkippingGroups,
178+
)
183179
reportsDestination = layout.buildDirectory.dir("compose_compiler")
184180
}
185181

@@ -290,15 +286,9 @@ dependencies {
290286
testImplementation(libs.test.mockito.kotlin)
291287
testImplementation(libs.test.robolectric)
292288
testImplementation(libs.test.turbine)
293-
// Linting
294289
detektPlugins(libs.detekt.formatting)
295290
detektPlugins(libs.detekt.compose.rules)
296291
}
297-
ksp {
298-
arg("room.schemaLocation", "$projectDir/schemas")
299-
arg("room.incremental", "true")
300-
arg("room.expandProjection", "true")
301-
}
302292
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
303293
room {
304294
schemaDirectory("$projectDir/schemas")

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayou
6565
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
6666
core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
6767
datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePrefs" }
68-
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version = "1.23.8" }
68+
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
6969
detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt", version = "0.4.23" }
7070
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
7171
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
@@ -122,7 +122,6 @@ protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version
122122
android-application = { id = "com.android.application", version.ref = "agp" }
123123
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
124124
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
125-
spotless = { id = "com.diffplug.spotless", version = "7.1.0" }
126125
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
127126
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
128127
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

0 commit comments

Comments
 (0)