[taler-taler-android] 01/02: Fix dependency issues

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository taler-android.

commit b2147f78eb11b6873b24231aafbce41b0686a8b0
Author: Torsten Grote <t@grobox.de>
AuthorDate: Tue May 9 13:44:41 2023 -0300

    Fix dependency issues
---
 .idea/compiler.xml                                                    | 2 +-
 .../src/main/java/net/taler/merchantpos/order/LiveOrder.kt            | 4 ++--
 .../src/main/java/net/taler/merchantpos/order/OrderManager.kt         | 4 ++--
 wallet/build.gradle                                                   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0bb9609..634c739 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,7 +11,7 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel target="11">
+    <bytecodeTargetLevel target="17">
       <module name="common_commonMain" target="1.6" />
       <module name="common_commonTest" target="1.6" />
       <module name="common_jvmMain" target="1.6" />
diff --git 
a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt 
b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
index ad9af74..c11b5c7 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
@@ -19,7 +19,7 @@ package net.taler.merchantpos.order
 import androidx.annotation.UiThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import net.taler.common.Amount
 import net.taler.common.CombinedLiveData
 import net.taler.merchantpos.config.Category
@@ -52,7 +52,7 @@ internal class MutableLiveOrder(
         get() = productsByCategory.keys.map { it.id to it }.toMap()
     override val order: MutableLiveData<Order?> =
         MutableLiveData(Order(id, currency, availableCategories))
-    override val orderTotal: LiveData<Amount> = Transformations.map(order) { 
it?.total }
+    override val orderTotal: LiveData<Amount> = order.map { it?.total ?: 
Amount.zero(currency) }
     override val restartState = MutableLiveData(DISABLED)
     private val selectedOrderLine = MutableLiveData<ConfigProduct?>()
     override val selectedProductKey: String?
diff --git 
a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt 
b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
index 96d2e83..2efdf4c 100644
--- 
a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
+++ 
b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
@@ -21,7 +21,7 @@ import android.util.Log
 import androidx.annotation.UiThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations.map
+import androidx.lifecycle.map
 import net.taler.merchantpos.R
 import net.taler.merchantpos.config.Category
 import net.taler.merchantpos.config.ConfigProduct
@@ -150,7 +150,7 @@ class OrderManager(private val context: Context) : 
ConfigurationReceiver {
         return currentOrderId != orders.keys.first()
     }
 
-    fun hasNextOrder(currentOrderId: Int) = 
map(order(currentOrderId).restartState) { state ->
+    fun hasNextOrder(currentOrderId: Int) = 
order(currentOrderId).restartState.map { state ->
         state == ENABLED || currentOrderId != orders.keys.last()
     }
 
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 6f717ab..076c374 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -120,13 +120,13 @@ dependencies {
     implementation "androidx.browser:browser:1.5.0"
 
     // Compose
-    implementation platform('androidx.compose:compose-bom:2023.04.01')
+    implementation platform('androidx.compose:compose-bom:2023.05.00')
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.compose.material:material-icons-extended'
-    implementation 'androidx.activity:activity-compose'
     implementation "androidx.compose.runtime:runtime-livedata"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
     implementation 
"com.google.accompanist:accompanist-themeadapter-material3:0.28.0"
+    implementation 'androidx.activity:activity-compose:1.7.1'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     debugImplementation 'androidx.compose.ui:ui-tooling'
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.