From db786c24510d2df8f5a5d3ec0931deaa252469ad Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 28 Jan 2020 12:55:47 -0800 Subject: [PATCH 1/1] Generate altosdroid/app/build.gradle at configure time This file includes the release version numbers, which are set in configure.ac. Signed-off-by: Keith Packard --- altosdroid/app/{build.gradle => build.gradle.in} | 6 +++--- configure.ac | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) rename altosdroid/app/{build.gradle => build.gradle.in} (93%) diff --git a/altosdroid/app/build.gradle b/altosdroid/app/build.gradle.in similarity index 93% rename from altosdroid/app/build.gradle rename to altosdroid/app/build.gradle.in index 1d976933..cc29d86c 100644 --- a/altosdroid/app/build.gradle +++ b/altosdroid/app/build.gradle.in @@ -17,10 +17,10 @@ android { compileSdkVersion 28 defaultConfig { applicationId "org.altusmetrum.AltosDroid" - minSdkVersion 26 + minSdkVersion 21 targetSdkVersion 28 - versionCode 19 - versionName "1.9.1rc1" + versionCode @ANDROID_VERSION@ + versionName "@VERSION@" } buildTypes { release { diff --git a/configure.ac b/configure.ac index 76b5e57a..d966988d 100644 --- a/configure.ac +++ b/configure.ac @@ -556,6 +556,7 @@ telegps/telegps-windows.nsi altosdroid/Makefile altosdroid/local.properties altosdroid/app/src/main/AndroidManifest.xml +altosdroid/app/build.gradle ao-tools/Makefile ao-tools/lib/Makefile ao-tools/ao-rawload/Makefile -- 2.39.5