Skip to content

Commit b670eb9

Browse files
committed
Add bitfunk quality plugin to replace local detekt and spotless plugins
1 parent 465b3d6 commit b670eb9

File tree

6 files changed

+4
-188
lines changed

6 files changed

+4
-188
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile-kmp/compare/v1.0.0..
1818
- MkDocs for generating project webpage
1919
- RenovateBot fo dependency updates
2020
- bitfunk versioning plugin to replace local project version plugin
21+
- bitfunk quality plugin to replace local detekt and spotless plugins
2122

2223
### Changed
2324

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ buildscript {
4444
plugins {
4545
alias(libs.plugins.gradleBlueprintDependency)
4646

47-
alias(libs.plugins.gradleBlueprintQualitySpotless)
48-
alias(libs.plugins.gradleBlueprintQualityDetekt)
47+
alias(libs.plugins.gradleBitfunkQuality)
4948
alias(libs.plugins.gradleBitfunkVersioning)
5049
}
5150

gradle/libs.versions.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ blueprintConfiguration = "1.0.0-SNAPSHOT"
1212
blueprintDependency = "1.0.0-SNAPSHOT"
1313
blueprintTools = "1.0.0-SNAPSHOT"
1414
decompose = "0.8.0"
15-
detekt = "1.21.0"
1615
gradleVersionCatalogUpdate = "0.2.2"
1716
gradleVersionUpdate = "0.44.0"
1817
jacoco = "0.8.7"
@@ -23,14 +22,13 @@ koin = "3.3.0"
2322
kotlin = "1.7.20"
2423
kotlinx-coroutines = "1.6.4"
2524
kotlinx-serialization = "1.4.1"
26-
ktlint = "0.47.1"
2725
ktor = "2.1.3"
2826
moko-resources = "0.20.1"
29-
spotless = "6.11.0"
3027
sqlDelight = "1.5.4"
3128
junit-jupiter = "5.9.1"
3229

3330
gradleBitfunkVersioning = "0.1.1"
31+
gradleBitfunkQuality = "0.1.1"
3432

3533
[libraries]
3634
accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" }
@@ -58,13 +56,10 @@ essenty-lifecycle = "com.arkivanov.essenty:lifecycle:0.2.2"
5856
google-android-material = "com.google.android.material:material:1.7.0"
5957
gradleAndroidPlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
6058
gradleBlueprintDependencyPlugin = { module = "eu.upwolf.gradle.blueprint.dependency:blueprint-dependency", version.ref = "blueprintDependency" }
61-
gradleDetektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
6259
gradleJetbrainsApplePlugin = { module = "org.jetbrains.gradle.apple:applePlugin", version.ref = "jetbrainsAppleGradlePlugin" }
6360
gradleJetbrainsComposePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrainsCompose" }
6461
gradleKotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
6562
gradleKotlinSerializationPlugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
66-
gradleKtlintPlugin = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
67-
gradleSpotlessPlugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
6863
gradleSqlDelightPlugin = { module = "com.squareup.sqldelight:gradle-plugin", version.ref = "sqlDelight" }
6964
gradleVersionCatalogUpdatePlugin = { module = "nl.littlerobots.vcu:plugin", version.ref = "gradleVersionCatalogUpdate" }
7065
gradleVersionUpdatePlugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionUpdate" }
@@ -131,8 +126,7 @@ gradleBlueprintConfigurationAndroidLibrary = { id = "eu.upwolf.gradle.blueprint.
131126
gradleBlueprintConfigurationKmpCommon = { id = "eu.upwolf.gradle.blueprint.configuration.kmp.common", version.ref = "blueprintConfiguration" }
132127
gradleBlueprintConfigurationKmpFeature = { id = "eu.upwolf.gradle.blueprint.configuration.kmp.feature", version.ref = "blueprintConfiguration" }
133128
gradleBlueprintDependency = { id = "eu.upwolf.gradle.blueprint.dependency", version.ref = "blueprintDependency" }
134-
gradleBlueprintQualityDetekt = { id = "eu.upwolf.gradle.blueprint.quality.detekt", version.ref = "blueprintTools" }
135-
gradleBlueprintQualitySpotless = { id = "eu.upwolf.gradle.blueprint.quality.spotless", version.ref = "blueprintTools" }
136129
gradleVersionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "gradleVersionCatalogUpdate" }
137130
gradleVersionUpdate = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionUpdate" }
138131
gradleBitfunkVersioning = { id = "eu.bitfunk.gradle.plugin.tool.versioning", version.ref = "gradleBitfunkVersioning" }
132+
gradleBitfunkQuality = { id = "eu.bitfunk.gradle.plugin.quality", version.ref = "gradleBitfunkQuality" }

gradlePlugin/blueprint-tools/build.gradle.kts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ gradlePlugin {
4141
id = "eu.upwolf.gradle.blueprint.publish"
4242
implementationClass = "eu.upwolf.gradle.blueprint.publish.PublishConfigurationPlugin"
4343
}
44-
// Quality
45-
plugins.register("eu.upwolf.gradle.blueprint.quality.spotless") {
46-
id = "eu.upwolf.gradle.blueprint.quality.spotless"
47-
implementationClass = "eu.upwolf.gradle.blueprint.quality.spotless.SpotlessConfigurationPlugin"
48-
}
49-
plugins.register("eu.upwolf.gradle.blueprint.quality.detekt") {
50-
id = "eu.upwolf.gradle.blueprint.quality.detekt"
51-
implementationClass = "eu.upwolf.gradle.blueprint.quality.detekt.DetektConfigurationPlugin"
52-
}
5344
}
5445

5546
java {
@@ -73,13 +64,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).all {
7364
dependencies {
7465
implementation(libs.gradleBlueprintDependencyPlugin)
7566

76-
// Quality
77-
// -> Detekt
78-
implementation(libs.gradleDetektPlugin)
79-
// -> Spotless
80-
implementation(libs.gradleSpotlessPlugin)
81-
implementation(libs.gradleKtlintPlugin)
82-
8367
// Testing
8468
testImplementation(gradleTestKit())
8569
testImplementation(libs.test.junit.jupiter)

gradlePlugin/blueprint-tools/src/main/kotlin/eu/upwolf/gradle/blueprint/quality/detekt/DetektConfigurationPlugin.kt

Lines changed: 0 additions & 100 deletions
This file was deleted.

gradlePlugin/blueprint-tools/src/main/kotlin/eu/upwolf/gradle/blueprint/quality/spotless/SpotlessConfigurationPlugin.kt

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)