diff options
author | mvglasow <michael -at- vonglasow.com> | 2018-08-21 22:41:29 +0200 |
---|---|---|
committer | mvglasow <michael -at- vonglasow.com> | 2018-08-21 22:41:29 +0200 |
commit | 964315b9c3721c1c52796386fdde0ddd83827dd4 (patch) | |
tree | 5eddf211510325f85ed1516f306b020e36a564c0 /navit/android | |
parent | 3f8d6584a4fa6b0ddfabfb444294d51655ca49ea (diff) | |
parent | 8bfc53427cae358a6b747f9c71d91bcc78e8dd65 (diff) | |
download | navit-964315b9c3721c1c52796386fdde0ddd83827dd4.tar.gz |
Merge branch 'master' into traffic
Diffstat (limited to 'navit/android')
-rw-r--r-- | navit/android/build.gradle | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/android/build.gradle b/navit/android/build.gradle index ca9dab255..e2e42bc80 100644 --- a/navit/android/build.gradle +++ b/navit/android/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply from: "$project.rootDir/gradle/scripts/git-scm-version.gradle" apply plugin: 'checkstyle' android { @@ -8,8 +9,8 @@ android { applicationId "org.navitproject.navit" minSdkVersion 9 targetSdkVersion 27 - versionCode 1 - versionName "1.0" + versionCode gitVersionCode + versionName gitVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" ndk { // need for now for 'x86_64' and , 'armeabi' and , 'arm64-v8a' abiFilters 'x86', 'armeabi-v7a' |