Skip to content

Commit 5a83a8f

Browse files
Fix version handling
1 parent 9174ad8 commit 5a83a8f

3 files changed

Lines changed: 14 additions & 18 deletions

File tree

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
id: get-version
4949
shell: bash
5050
run: |
51-
version=$(./gradlew :getVersion --no-daemon --console=plain --quiet)
51+
version=$(./gradlew :properties --property version --no-daemon --console=plain --quiet | awk '/^version:/ {print $2}')
5252
echo "version=$version" >> "$GITHUB_OUTPUT"
5353
- name: Publish package
5454
run: ./gradlew publish

build-logic/convention/src/main/kotlin/AndroidConnectorLibraryConventionPlugin.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class AndroidConnectorLibraryConventionPlugin : Plugin<Project> {
2424
apply(plugin = "org.jetbrains.dokka-javadoc")
2525
apply(plugin = "maven-publish")
2626

27+
version = libs.versions.androidConnector
28+
2729
extensions.configure<LibraryExtension> {
2830
compileSdk = 36
2931

@@ -68,9 +70,6 @@ class AndroidConnectorLibraryConventionPlugin : Plugin<Project> {
6870
}
6971

7072
extensions.configure<DokkaExtension> {
71-
val connectorVersion = libs.versions.androidConnector
72-
version = connectorVersion
73-
7473
dokkaSourceSets.configureEach {
7574
externalDocumentationLinks.register("com.theoplayer.android.api") {
7675
url("https://optiview.dolby.com/docs/theoplayer/v10/api-reference/android/")

build.gradle.kts

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,23 @@ plugins {
2020
alias(libs.plugins.kotlinx.serialization) apply false
2121
}
2222

23-
tasks.register("getVersion") {
24-
doLast {
25-
println(rootProject.version)
26-
}
27-
}
23+
version = libs.versions.androidConnector
2824

2925
tasks.register("updateVersion") {
3026
val versionCatalog = rootProject.file("gradle/libs.versions.toml")
3127
inputs.file(versionCatalog)
3228

3329
val connectorVersion: String? by project.ext
34-
require(!connectorVersion.isNullOrBlank()) { "Missing connectorVersion" }
35-
36-
ant.withGroovyBuilder {
37-
"replaceregexp"(
38-
"file" to versionCatalog,
39-
"match" to """^androidConnector = ".+"$""",
40-
"replace" to """androidConnector = "$connectorVersion"""",
41-
"byline" to true
42-
)
30+
doLast {
31+
require(!connectorVersion.isNullOrBlank()) { "Missing connectorVersion" }
32+
ant.withGroovyBuilder {
33+
"replaceregexp"(
34+
"file" to versionCatalog,
35+
"match" to """^androidConnector = ".+"$""",
36+
"replace" to """androidConnector = "$connectorVersion"""",
37+
"byline" to true
38+
)
39+
}
4340
}
4441
}
4542

0 commit comments

Comments
 (0)