From 6ed272714f2fe35f2f9babed050de49a5f0d4ae2 Mon Sep 17 00:00:00 2001 From: roshanrajaratnam Date: Tue, 12 Apr 2022 13:13:56 +0200 Subject: [PATCH] Get version code and version name from tag. --- app/build.gradle | 5 +++-- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 065de2d0..63cc16df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,6 +22,7 @@ apply plugin: 'com.android.application' apply plugin: 'dagger.hilt.android.plugin' +apply from: rootProject.file("gradle/git-tag-version.gradle") android { @@ -31,8 +32,8 @@ android { applicationId "no.nordicsemi.android.nrfmeshprovisioner" minSdkVersion 19 targetSdkVersion 32 - versionCode 84 - versionName VERSION_NAME + versionCode getVersionCodeFromTags() + versionName getVersionNameFromTags() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/gradle.properties b/gradle.properties index ade65e3b..a1d20ce7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ org.gradle.jvmargs=-Xmx1536m # org.gradle.parallel=trueandroid.useAndroidX=true android.useAndroidX=true -VERSION_NAME=3.1.9 +# VERSION_NAME=3.2.0 GROUP=no.nordicsemi.android POM_DESCRIPTION=BLE Mesh library for Android