Skip to content

Commit 465b3d6

Browse files
committed
Add bitfunk versioning plugin to replace local project version plugin
1 parent 35bdb8b commit 465b3d6

File tree

7 files changed

+8
-203
lines changed

7 files changed

+8
-203
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile-kmp/compare/v1.0.0..
1717
- Documentation
1818
- MkDocs for generating project webpage
1919
- RenovateBot fo dependency updates
20+
- bitfunk versioning plugin to replace local project version plugin
2021

2122
### Changed
2223

app-android/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* PERFORMANCE OF THIS SOFTWARE.
1717
*/
1818

19-
import eu.upwolf.gradle.blueprint.version.version
20-
import eu.upwolf.gradle.blueprint.version.versionCode
19+
import eu.bitfunk.gradle.plugin.tool.versioning.version
20+
import eu.bitfunk.gradle.plugin.tool.versioning.versionCode
2121

2222
@Suppress("DSL_SCOPE_VIOLATION")
2323
plugins {

app-desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* PERFORMANCE OF THIS SOFTWARE.
1717
*/
1818

19-
import eu.upwolf.gradle.blueprint.version.versionCleaned
19+
import eu.bitfunk.gradle.plugin.tool.versioning.versionCleaned
2020
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2121

2222
@Suppress("DSL_SCOPE_VIOLATION")

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ plugins {
4646

4747
alias(libs.plugins.gradleBlueprintQualitySpotless)
4848
alias(libs.plugins.gradleBlueprintQualityDetekt)
49-
alias(libs.plugins.gradleBlueprintVersion)
49+
alias(libs.plugins.gradleBitfunkVersioning)
5050
}
5151

5252
allprojects {

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ blueprintDependency = "1.0.0-SNAPSHOT"
1313
blueprintTools = "1.0.0-SNAPSHOT"
1414
decompose = "0.8.0"
1515
detekt = "1.21.0"
16-
gitVersion = "0.12.6"
1716
gradleVersionCatalogUpdate = "0.2.2"
1817
gradleVersionUpdate = "0.44.0"
1918
jacoco = "0.8.7"
@@ -31,6 +30,8 @@ spotless = "6.11.0"
3130
sqlDelight = "1.5.4"
3231
junit-jupiter = "5.9.1"
3332

33+
gradleBitfunkVersioning = "0.1.1"
34+
3435
[libraries]
3536
accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" }
3637
accompanist-insetsUi = { module = "com.google.accompanist:accompanist-insets-ui", version.ref = "accompanist" }
@@ -58,7 +59,6 @@ google-android-material = "com.google.android.material:material:1.7.0"
5859
gradleAndroidPlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
5960
gradleBlueprintDependencyPlugin = { module = "eu.upwolf.gradle.blueprint.dependency:blueprint-dependency", version.ref = "blueprintDependency" }
6061
gradleDetektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
61-
gradleGitVersionPlugin = { module = "eu.upwolf.gradle.gitversion:gradle-git-version", version.ref = "gitVersion" }
6262
gradleJetbrainsApplePlugin = { module = "org.jetbrains.gradle.apple:applePlugin", version.ref = "jetbrainsAppleGradlePlugin" }
6363
gradleJetbrainsComposePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrainsCompose" }
6464
gradleKotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -133,6 +133,6 @@ gradleBlueprintConfigurationKmpFeature = { id = "eu.upwolf.gradle.blueprint.conf
133133
gradleBlueprintDependency = { id = "eu.upwolf.gradle.blueprint.dependency", version.ref = "blueprintDependency" }
134134
gradleBlueprintQualityDetekt = { id = "eu.upwolf.gradle.blueprint.quality.detekt", version.ref = "blueprintTools" }
135135
gradleBlueprintQualitySpotless = { id = "eu.upwolf.gradle.blueprint.quality.spotless", version.ref = "blueprintTools" }
136-
gradleBlueprintVersion = { id = "eu.upwolf.gradle.blueprint.version", version.ref = "blueprintTools" }
137136
gradleVersionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "gradleVersionCatalogUpdate" }
138137
gradleVersionUpdate = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionUpdate" }
138+
gradleBitfunkVersioning = { id = "eu.bitfunk.gradle.plugin.tool.versioning", version.ref = "gradleBitfunkVersioning" }

gradlePlugin/blueprint-tools/build.gradle.kts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
* PERFORMANCE OF THIS SOFTWARE.
1717
*/
1818

19-
import eu.upwolf.gradle.blueprint.dependency.byEnv
20-
import eu.upwolf.gradle.blueprint.dependency.byProperty
21-
2219
@Suppress("DSL_SCOPE_VIOLATION")
2320
plugins {
2421
`kotlin-dsl`
@@ -32,13 +29,6 @@ repositories {
3229
gradlePluginPortal()
3330
mavenCentral()
3431
google()
35-
maven {
36-
url = uri("https://maven.pkg.github.com/bitfunk/gradle-git-version")
37-
credentials {
38-
username = "githubPackageDownload.user".byProperty(project) ?: "GITHUB_PACKAGE_DOWNLOAD_USER".byEnv()
39-
password = "githubPackageDownload.key".byProperty(project) ?: "GITHUB_PACKAGE_DOWNLOAD_KEY".byEnv()
40-
}
41-
}
4232
}
4333

4434
// To make it available as direct dependency
@@ -60,11 +50,6 @@ gradlePlugin {
6050
id = "eu.upwolf.gradle.blueprint.quality.detekt"
6151
implementationClass = "eu.upwolf.gradle.blueprint.quality.detekt.DetektConfigurationPlugin"
6252
}
63-
// Version
64-
plugins.register("eu.upwolf.gradle.blueprint.version") {
65-
id = "eu.upwolf.gradle.blueprint.version"
66-
implementationClass = "eu.upwolf.gradle.blueprint.version.VersionConfigurationPlugin"
67-
}
6853
}
6954

7055
java {
@@ -95,9 +80,6 @@ dependencies {
9580
implementation(libs.gradleSpotlessPlugin)
9681
implementation(libs.gradleKtlintPlugin)
9782

98-
// Version
99-
implementation(libs.gradleGitVersionPlugin)
100-
10183
// Testing
10284
testImplementation(gradleTestKit())
10385
testImplementation(libs.test.junit.jupiter)

gradlePlugin/blueprint-tools/src/main/kotlin/eu/upwolf/gradle/blueprint/version/VersionConfigurationPlugin.kt

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

0 commit comments

Comments
 (0)