From 95ca0649e7a19a3b431b34aff21ca02d8c5326ca Mon Sep 17 00:00:00 2001 From: Mike Wong Date: Wed, 9 Oct 2024 12:04:12 +0200 Subject: [PATCH] Set correct library version --- .github/workflows/maven-central-tags.yml | 2 +- build.gradle | 24 ++++++++++++++++++++++++ example/build.gradle | 4 ++-- gradle.properties | 3 ++- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-central-tags.yml b/.github/workflows/maven-central-tags.yml index b430035..d97a2f1 100644 --- a/.github/workflows/maven-central-tags.yml +++ b/.github/workflows/maven-central-tags.yml @@ -36,4 +36,4 @@ jobs: env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - run: ./gradlew closeAndReleaseRepository -PmavenCentralUsername=$OSSRH_USERNAME -PmavenCentralPassword=$OSSRH_PASSWORD + run: ./gradlew releaseRepository -PmavenCentralUsername=$OSSRH_USERNAME -PmavenCentralPassword=$OSSRH_PASSWORD diff --git a/build.gradle b/build.gradle index 1559af7..c0ca67d 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,34 @@ task clean(type: Delete) { } allprojects { + group = property("GROUP").toString() + version = getProjectVersion() + + plugins.withId("com.vanniktech.maven.publish") { + mavenPublishing { + pom { + group = project.group + version = project.version + } + } + } + + // https://github.com/Kotlin/dokka/issues/2956 tasks.matching { task -> task.name.contains("javaDocReleaseGeneration") }.configureEach { enabled = false } +} + +private String getProjectVersion() { + def versionFromGradleProperties = property("VERSION").toString() + def versionFromWorkflow = null + try { + versionFromWorkflow = property("githubRefName").toString().replaceFirst("^v", "") + } catch (MissingPropertyException ignored) { + // Ignore exception and continue + } + return versionFromWorkflow ?: versionFromGradleProperties } \ No newline at end of file diff --git a/example/build.gradle b/example/build.gradle index 3650008..929be2e 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -16,8 +16,8 @@ android { applicationId "ch.ubique.qrscanner.example" minSdk 23 targetSdk 34 - versionCode 1 - versionName "1.0.0" + versionCode project.version.toString().split('-')[0].replace(".", "").toInteger() + versionName project.version.toString() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/gradle.properties b/gradle.properties index a6676ce..8f9a1b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,7 +29,8 @@ android.enableR8.fullMode=false # Artifact metadata GROUP=ch.ubique.android -VERSION_NAME=1.0.0 +# VERSION will only be used if no property "githubRefName" is set (which the release workflow does) +VERSION=0.0.1 # POM metadata POM_PACKAGING=aar