[taler-taler-android] branch master updated (62c86e4 -> 9a2f1e6)

[gnunet]

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

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

    from 62c86e4  [wallet] navigate back to main screen after outgoing push is 
complete
     new 28d3b68  [wallet] Fix ExtendedStatus deserialization
     new fba760a  [wallet] Upgrade all the things and target Android 13
     new 9a2f1e6  [cashier] Target Android 13

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                       |  7 +++----
 cashier/build.gradle                               |  2 +-
 .../src/main/java/net/taler/common/Event.kt        |  4 ++--
 wallet/build.gradle                                | 24 +++++++++++-----------
 .../net/taler/wallet/transactions/Transactions.kt  |  1 +
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index fde36e0..2587abd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,11 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.10' // observe compatibility with compose 
compiler
-        ktor_version = '2.1.3'
+        kotlin_version = '1.8.20' // observe compatibility with compose 
compiler
+        ktor_version = '2.3.0'
         nav_version = '2.5.3'
         material_version = '1.8.0'
-        lifecycle_version = '2.5.1'
+        lifecycle_version = '2.6.1'
         constraintlayout_version = '2.1.4'
-        compose_version = '1.3.3'
         junit_version = "4.13.2"
         // check https://android-rebuilds.beuc.net/ for availability of free 
build tools
         build_tools_version = "33.0.1"
diff --git a/cashier/build.gradle b/cashier/build.gradle
index c238513..dd8d787 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -30,7 +30,7 @@ android {
     defaultConfig {
         applicationId "net.taler.cashier"
         minSdkVersion 23
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 2
         versionName "0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/Event.kt 
b/taler-kotlin-android/src/main/java/net/taler/common/Event.kt
index 752e20e..868063c 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/Event.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/Event.kt
@@ -49,7 +49,7 @@ fun <T> T.toEvent() = Event(this)
  * [onEvent] is *only* called if the [Event]'s contents has not been consumed.
  */
 class EventObserver<T>(private val onEvent: (T) -> Unit) : Observer<Event<T>> {
-    override fun onChanged(event: Event<T>?) {
-        event?.getIfNotConsumed()?.let { onEvent(it) }
+    override fun onChanged(value: Event<T>) {
+        value.getIfNotConsumed()?.let { onEvent(it) }
     }
 }
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 1652f4f..6f717ab 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -41,7 +41,7 @@ android {
     defaultConfig {
         applicationId "net.taler.wallet"
         minSdkVersion 24
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 28
         versionName "0.9.3+p2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -86,7 +86,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.3"
+        kotlinCompilerExtensionVersion "1.4.6"
     }
 
     buildFeatures {
@@ -120,18 +120,18 @@ dependencies {
     implementation "androidx.browser:browser:1.5.0"
 
     // Compose
-    implementation 'androidx.activity:activity-compose:1.6.1'
-    implementation "androidx.compose.animation:animation:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "androidx.compose.material:material:1.3.1"
-    implementation "androidx.compose.material3:material3:1.0.1"
-    implementation "androidx.compose.material:material-icons-extended:1.3.1"
-    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-    implementation 
"androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation platform('androidx.compose:compose-bom:2023.04.01')
+    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.compose.ui:ui-tooling-preview'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
 
     // Lists and Selection
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.0"
     implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
 
     // Navigation Library
@@ -144,7 +144,7 @@ dependencies {
     // QR codes
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
     // needed to support zxing library in taler-kotlin-android on API < 24
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     // Nicer ProgressBar
     implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt 
b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 29c5717..6d753ba 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -116,6 +116,7 @@ sealed class Transaction {
     abstract val generalTitleRes: Int
 }
 
+@Serializable
 enum class ExtendedStatus {
     @SerialName("pending")
     Pending,

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