From b9bd3f5967b66a703abe1093a027be36faffbd0d Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 4 Apr 2023 22:22:51 +0200
Subject: [PATCH] Update all libraries

---
 CHANGELOG.md                             |  4 ++++
 app/build.gradle                         | 15 ++++++++-------
 app/src/main/AndroidManifest.xml         |  3 +--
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05fe2dea6..1608bb77d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased - 119
+
+- Use Material You colours on more devices (Google library update)
+
 ## v2.22.0 - 118
 
 - Support setting start of card validity
diff --git a/app/build.gradle b/app/build.gradle
index afc1ac0b1..8a8cd63a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,9 +58,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
 
     sourceSets {
         test {
@@ -80,18 +77,22 @@ android {
             includeAndroidResources true
         }
     }
+    lint {
+        lintConfig file('lint.xml')
+    }
+    namespace 'protect.card_locker'
 }
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
 // Splash Screen
     implementation 'androidx.core:core-splashscreen:1.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2a9593e0..2e65d3692 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="protect.card_locker">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
diff --git a/build.gradle b/build.gradle
index 8132cb54c..894beab48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '7.0.4' apply false
+    id 'com.android.application' version '7.4.2' apply false
     id 'com.github.spotbugs' version "4.7.5" apply false
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d04a6aa4..7b0f14283 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 25 20:59:51 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME