From 58a3e4589823f61ec89ed4e709ed50d958733140 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 30 Jun 2022 17:34:10 -0300
Subject: Fix wallet build by upgrading Kotlin/compose

---
 build.gradle        | 25 ++++++++++++++-----------
 wallet/build.gradle | 12 ++++++------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 150d31f..0598741 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,18 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    ext.ktor_version = '2.0.1'
-    ext.nav_version = '2.5.0'
-    ext.material_version = '1.6.1'
-    ext.lifecycle_version = '2.4.1'
-    ext.constraintlayout_version = '2.1.4'
-    ext.junit_version = "4.13.2"
-    // check https://android-rebuilds.beuc.net/ for availability of free build tools
-    ext.build_tools_version = "30.0.3"
-    // should debug build types be minified with D8 as well?
-    ext.minify_debug = false
+    ext {
+        kotlin_version = '1.6.21'
+        ktor_version = '2.0.1'
+        nav_version = '2.5.0'
+        material_version = '1.6.1'
+        lifecycle_version = '2.4.1'
+        constraintlayout_version = '2.1.4'
+        compose_version = '1.2.0-rc02'
+        junit_version = "4.13.2"
+        // check https://android-rebuilds.beuc.net/ for availability of free build tools
+        build_tools_version = "30.0.3"
+        // should debug build types be minified with D8 as well? good for catching issues early
+        minify_debug = true
+    }
     repositories {
         google()
         mavenCentral()
diff --git a/wallet/build.gradle b/wallet/build.gradle
index faebdde..ae3266c 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -91,7 +91,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.1.1'
+        kotlinCompilerExtensionVersion compose_version
     }
 
     buildFeatures {
@@ -129,12 +129,12 @@ dependencies {
 
     // Compose
     implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation 'androidx.compose.material:material:1.1.1'
-    implementation 'androidx.compose.animation:animation:1.1.1'
-    implementation 'androidx.compose.ui:ui-tooling:1.1.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.1.1'
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.animation:animation:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
-    implementation 'com.google.android.material:compose-theme-adapter:1.1.9'
+    implementation 'com.google.android.material:compose-theme-adapter:1.1.13'
 
     // Lists and Selection
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-- 
cgit v1.2.3