From cf4a188e40ab5d6baf6d0ab0f80a7815c42cdd05 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Thu, 21 Oct 2021 15:56:39 +0200 Subject: [PATCH] Rename flavours to specify targetSdkVersion The targetSdkVersion specifies which behaviour the app expects from the android platform. For past releases of BRouter the targetSdkVersion was specified in the filename, therefore this restores the old bevahior. --- brouter-routing-app/build.gradle | 9 ++++----- brouter-server/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index dfaee18..b58f639 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -13,7 +13,6 @@ android { resValue('string', 'app_version', defaultConfig.versionName) setProperty("archivesBaseName","BRouterApp." + defaultConfig.versionName) - } if(project.hasProperty("RELEASE_STORE_FILE")) { @@ -65,20 +64,20 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + flavorDimensions "api" productFlavors { - api10 { + api19 { dimension "api" minSdkVersion 10 targetSdkVersion 19 } - api19 { + api30 { dimension "api" minSdkVersion 19 targetSdkVersion 30 - } } @@ -86,7 +85,7 @@ android { dependencies { - api19Implementation 'androidx.appcompat:appcompat:1.3.1' + api30Implementation 'androidx.appcompat:appcompat:1.3.1' implementation project(':brouter-mapaccess') implementation project(':brouter-core') diff --git a/brouter-server/build.gradle b/brouter-server/build.gradle index 1cc9361..6b4aaea 100644 --- a/brouter-server/build.gradle +++ b/brouter-server/build.gradle @@ -54,10 +54,10 @@ distributions { include 'readmes/*' include 'profiles2/*' } - from ('../brouter-routing-app/build/outputs/apk/api10/release') { + from ('../brouter-routing-app/build/outputs/apk/api19/release') { include '*.apk' } - from ('../brouter-routing-app/build/outputs/apk/api19/release') { + from ('../brouter-routing-app/build/outputs/apk/api30/release') { include '*.apk' } from ('../brouter-server/build/libs') {