From: Keith Packard Date: Tue, 28 Jan 2020 20:55:47 +0000 (-0800) Subject: Generate altosdroid/app/build.gradle at configure time X-Git-Tag: altosdroid-1.9.1~2 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=db786c24510d2df8f5a5d3ec0931deaa252469ad 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 --- diff --git a/altosdroid/app/build.gradle b/altosdroid/app/build.gradle deleted file mode 100644 index 1d976933..00000000 --- a/altosdroid/app/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -apply plugin: 'com.android.application' - -def keystorePropertiesFile = file(System.properties['user.home'] + "/altusmetrumllc/android_keystore.properties") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - -android { - signingConfigs { - release { - storeFile file(System.properties['user.home'] + "/altusmetrumllc/android_keystore.jks") - storePassword keystoreProperties['storePassword'] - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - } - } - - compileSdkVersion 28 - defaultConfig { - applicationId "org.altusmetrum.AltosDroid" - minSdkVersion 26 - targetSdkVersion 28 - versionCode 19 - versionName "1.9.1rc1" - } - buildTypes { - release { - signingConfig signingConfigs.release - minifyEnabled false - debuggable false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - debug { - debuggable true - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.gms:play-services-maps:17.0.0' - implementation fileTree(dir: 'libs', include: ['*.jar']) -} - diff --git a/altosdroid/app/build.gradle.in b/altosdroid/app/build.gradle.in new file mode 100644 index 00000000..cc29d86c --- /dev/null +++ b/altosdroid/app/build.gradle.in @@ -0,0 +1,47 @@ +apply plugin: 'com.android.application' + +def keystorePropertiesFile = file(System.properties['user.home'] + "/altusmetrumllc/android_keystore.properties") +def keystoreProperties = new Properties() +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + +android { + signingConfigs { + release { + storeFile file(System.properties['user.home'] + "/altusmetrumllc/android_keystore.jks") + storePassword keystoreProperties['storePassword'] + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + } + } + + compileSdkVersion 28 + defaultConfig { + applicationId "org.altusmetrum.AltosDroid" + minSdkVersion 21 + targetSdkVersion 28 + versionCode @ANDROID_VERSION@ + versionName "@VERSION@" + } + buildTypes { + release { + signingConfig signingConfigs.release + minifyEnabled false + debuggable false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + debug { + debuggable true + } + } + lintOptions { + abortOnError false + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.gms:play-services-maps:17.0.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) +} + 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