diff options
| author | Iván Ávalos <avalos@disroot.org> | 2023-09-07 12:19:03 -0600 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-09-08 11:57:46 +0200 |
| commit | 26d8690003905822204cfc21d701ceacf15c9482 (patch) | |
| tree | 386156f533c97910e39fdaf7df0160e97d3c90a1 | |
| parent | 7392cd72ddd3406369b13bd8a7f57fb18822eaa2 (diff) | |
| download | taler-android-26d8690003905822204cfc21d701ceacf15c9482.tar.gz taler-android-26d8690003905822204cfc21d701ceacf15c9482.tar.bz2 taler-android-26d8690003905822204cfc21d701ceacf15c9482.zip | |
[merchant-terminal] Refactor backend version to BuildConfig and bump to 5:0:1
| -rw-r--r-- | merchant-terminal/build.gradle | 2 | ||||
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle index 2ec9c4e..f55f574 100644 --- a/merchant-terminal/build.gradle +++ b/merchant-terminal/build.gradle @@ -18,6 +18,8 @@ android { versionCode 5 versionName "0.2.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField("String", "BACKEND_API_VERSION", "\"5:0:1\"") } buildTypes { diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt index 2cc0d8c..70c7b18 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt @@ -40,6 +40,7 @@ import net.taler.common.getIncompatibleStringOrNull import net.taler.merchantlib.ConfigResponse import net.taler.merchantlib.MerchantApi import net.taler.merchantlib.MerchantConfig +import net.taler.merchantpos.BuildConfig import net.taler.merchantpos.R private const val SETTINGS_NAME = "taler-merchant-terminal" @@ -52,7 +53,7 @@ internal const val CONFIG_URL_DEMO = "https://docs.taler.net/_static/sample-pos- internal const val CONFIG_USERNAME_DEMO = "" internal const val CONFIG_PASSWORD_DEMO = "" -private val VERSION = Version(3, 0, 1) +private val VERSION = Version.parse(BuildConfig.BACKEND_API_VERSION)!! private val TAG = ConfigManager::class.java.simpleName |