Skip to content

Commit b9ad82b

Browse files
authored
Enable Reckon settings all the time (#6391)
1 parent e9f5156 commit b9ad82b

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

settings.gradle.kts

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,25 @@ pluginManagement {
1818
}
1919
}
2020

21-
// Reckon plugin doesn't work in git worktrees (JGit doesn't handle worktree .git files).
22-
// Detect worktrees (.git is a file, not a directory) and skip reckon in that case.
23-
val isWorktree = settings.settingsDir.resolve(".git").isFile
24-
2521
plugins {
2622
// So we can't reach the libs.plugins.* aliases from here so we need to declare them the old way...
27-
id("org.ajoberstar.reckon.settings").version("2.0.0").apply(false)
23+
id("org.ajoberstar.reckon.settings").version("2.0.0")
2824
}
2925

30-
if (!isWorktree) {
31-
apply(plugin = "org.ajoberstar.reckon.settings")
32-
33-
extensions.configure<org.ajoberstar.reckon.gradle.ReckonExtension>("reckon") {
34-
val isCiBuild = providers.environmentVariable("CI").isPresent
26+
extensions.configure<org.ajoberstar.reckon.gradle.ReckonExtension>("reckon") {
27+
val isCiBuild = providers.environmentVariable("CI").isPresent
3528

36-
setDefaultInferredScope("patch")
37-
if (!isCiBuild) {
38-
// Use a snapshot version scheme with Reckon when not running in CI, which allows caching to
39-
// improve performance. Background: https://github.com/home-assistant/android/issues/5220.
40-
snapshots()
41-
} else {
42-
stages("beta", "final")
43-
}
44-
setScopeCalc { java.util.Optional.of(org.ajoberstar.reckon.core.Scope.PATCH) }
45-
setStageCalc(calcStageFromProp())
46-
setTagWriter { it.toString() }
29+
setDefaultInferredScope("patch")
30+
if (!isCiBuild) {
31+
// Use a snapshot version scheme with Reckon when not running in CI, which allows caching to
32+
// improve performance. Background: https://github.com/home-assistant/android/issues/5220.
33+
snapshots()
34+
} else {
35+
stages("beta", "final")
4736
}
37+
setScopeCalc { java.util.Optional.of(org.ajoberstar.reckon.core.Scope.PATCH) }
38+
setStageCalc(calcStageFromProp())
39+
setTagWriter { it.toString() }
4840
}
4941

5042
dependencyResolutionManagement {

0 commit comments

Comments
 (0)