Skip to content

Commit 8e64ed8

Browse files
committed
Simplify Gradle versioning
1 parent 0618f07 commit 8e64ed8

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

.github/workflows/release-maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
if: ${{ startsWith(github.ref, 'refs/tags/') }}
2828
run: |
2929
version="${GITHUB_REF_NAME#v}"
30-
nix develop --command env VERSION="$version" \
31-
gradle --no-daemon publishAndReleaseToMavenCentral
30+
nix develop --command gradle --no-daemon \
31+
"-PreleaseVersion=$version" publishAndReleaseToMavenCentral
3232
env:
3333
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
3434
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}

build.gradle.kts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,8 @@ plugins {
2525
alias(libs.plugins.vanniktech.maven.publish) apply false
2626
}
2727

28-
val computedVersion =
29-
providers
30-
.gradleProperty("releaseVersion")
31-
.orElse(providers.environmentVariable("VERSION").map { it.removePrefix("v") })
32-
.orElse(
33-
providers.provider {
34-
rootProject.file("VERSION").takeIf { it.isFile }?.readText()?.trim()?.takeIf {
35-
it.isNotEmpty()
36-
} ?: "0.0.0-SNAPSHOT"
37-
}
38-
)
39-
4028
group = "com.sourcegraph"
41-
version = computedVersion.get()
29+
version = providers.gradleProperty("releaseVersion").orElse("0.0.0-SNAPSHOT").get()
4230

4331
val javacModuleOptions =
4432
listOf(

0 commit comments

Comments
 (0)