[taler-taler-android] branch master updated: [wallet] Update libraries after release

[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.

The following commit(s) were added to refs/heads/master by this push:
     new 5671315  [wallet] Update libraries after release
5671315 is described below

commit 5671315b97a5fd02b3bebb04788f6b67cac71817
Author: Torsten Grote <t@grobox.de>
AuthorDate: Tue Jan 31 15:07:30 2023 -0300

    [wallet] Update libraries after release
---
 build.gradle                                                      | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties                          | 2 +-
 merchant-lib/build.gradle                                         | 2 +-
 merchant-terminal/build.gradle                                    | 2 +-
 .../src/main/java/net/taler/merchantpos/MainActivity.kt           | 1 +
 taler-kotlin-android/build.gradle                                 | 2 +-
 taler-kotlin-android/src/main/AndroidManifest.xml                 | 3 +--
 wallet/build.gradle                                               | 4 ++--
 wallet/src/main/java/net/taler/wallet/MainActivity.kt             | 1 +
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 93d8a9b..70d1bce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.20' // observe compatibility with compose 
compiler
+        kotlin_version = '1.8.0' // observe compatibility with compose compiler
         ktor_version = '2.1.3'
         nav_version = '2.5.3'
-        material_version = '1.7.0'
+        material_version = '1.8.0'
         lifecycle_version = '2.5.1'
         constraintlayout_version = '2.1.4'
-        compose_version = '1.3.2'
+        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"
@@ -18,7 +18,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 
"androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 17f9e71..752e3d5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Aug 27 15:56:47 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index ae7489b..50c2aa5 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -70,4 +70,4 @@ 
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
-}
\ No newline at end of file
+}
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 6d9dac1..71936b5 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -76,6 +76,6 @@ dependencies {
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
-    testImplementation 'androidx.test.ext:junit:1.1.4'
+    testImplementation 'androidx.test.ext:junit:1.1.5'
     testImplementation 'org.robolectric:robolectric:4.8.1'
 }
diff --git 
a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt 
b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
index 29f5da4..5609429 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
@@ -103,6 +103,7 @@ class MainActivity : AppCompatActivity(), 
OnNavigationItemSelectedListener {
         return true
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         val currentDestination = nav.currentDestination?.id
         if (ui.drawerLayout.isDrawerOpen(START)) {
diff --git a/taler-kotlin-android/build.gradle 
b/taler-kotlin-android/build.gradle
index 69b4f4d..8cb99ed 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 
diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml 
b/taler-kotlin-android/src/main/AndroidManifest.xml
index 5533913..bc489b1 100644
--- a/taler-kotlin-android/src/main/AndroidManifest.xml
+++ b/taler-kotlin-android/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ GNU Taler; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    package="net.taler.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android";>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 737a1de..fb897c6 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -92,7 +92,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+        kotlinCompilerExtensionVersion "1.4.0"
     }
 
     buildFeatures {
@@ -149,7 +149,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:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
 
     // Nicer ProgressBar
     implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt 
b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index 13fd394..c3fc433 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -142,6 +142,7 @@ class MainActivity : AppCompatActivity(), 
OnNavigationItemSelectedListener,
         })
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         if (ui.drawerLayout.isDrawerOpen(START)) 
ui.drawerLayout.closeDrawer(START)
         else super.onBackPressed()

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