From 8d2de40df6ae9073030ea05a35b8ff1136ca9acc Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 24 Jun 2024 13:14:52 +0200
Subject: [PATCH] fix: Upgrade all modules to API 34 #1730

---
 app/build.gradle                                       |  1 -
 crypto/build.gradle                                    |  5 ++---
 database/build.gradle                                  |  5 ++---
 icon-pack/build.gradle                                 |  5 ++---
 icon-pack/classic/build.gradle                         |  5 ++---
 icon-pack/material/build.gradle                        |  5 ++---
 .../main/java/com/kunzisoft/keepass/icon/IconPack.kt   | 10 ++++++----
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a9a765060..224b0dc6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'kotlin-kapt'
 android {
     namespace 'com.kunzisoft.keepass'
     compileSdkVersion 34
-    buildToolsVersion "33.0.2"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
diff --git a/crypto/build.gradle b/crypto/build.gradle
index dabc737ed..20634e48f 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -5,13 +5,12 @@ plugins {
 
 android {
     namespace 'com.kunzisoft.encrypt'
-    compileSdkVersion 33
-    buildToolsVersion "33.0.2"
+    compileSdkVersion 34
     ndkVersion "21.4.7075529"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 33
+        targetSdkVersion 34
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/database/build.gradle b/database/build.gradle
index 5d094478f..b11df6359 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace 'com.kunzisoft.keepass.database'
-    compileSdkVersion 33
-    buildToolsVersion "33.0.2"
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 15
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle
index 5285bb64c..bceaec7f5 100644
--- a/icon-pack/build.gradle
+++ b/icon-pack/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace 'com.kunzisoft.keepass.icon'
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     compileOptions {
diff --git a/icon-pack/classic/build.gradle b/icon-pack/classic/build.gradle
index 24d79b865..c5262974d 100644
--- a/icon-pack/classic/build.gradle
+++ b/icon-pack/classic/build.gradle
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'com.kunzisoft.keepass.icon.classic'
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     resourcePrefix 'classic_'
diff --git a/icon-pack/material/build.gradle b/icon-pack/material/build.gradle
index ada0c8d61..b4dfe5d79 100644
--- a/icon-pack/material/build.gradle
+++ b/icon-pack/material/build.gradle
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'com.kunzisoft.keepass.icon.material'
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     resourcePrefix 'material_'
diff --git a/icon-pack/src/main/java/com/kunzisoft/keepass/icon/IconPack.kt b/icon-pack/src/main/java/com/kunzisoft/keepass/icon/IconPack.kt
index 3996e336a..d60a59029 100644
--- a/icon-pack/src/main/java/com/kunzisoft/keepass/icon/IconPack.kt
+++ b/icon-pack/src/main/java/com/kunzisoft/keepass/icon/IconPack.kt
@@ -19,18 +19,19 @@
  */
 package com.kunzisoft.keepass.icon
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Resources
 import android.util.SparseIntArray
-import java.util.*
+import java.util.Locale
 
 /**
  * Class who construct dynamically database icons contains in a separate library
  *
  *
- * It only supports icons with specific nomenclature **[stringId]_[%2d]_32dp**
- * where [stringId] contains in a string xml attribute with id **resource_id** and
- * [%2d] 2 numerical numbers between 00 and 68 included,
+ * It only supports icons with specific nomenclature **{stringId}_{%2d}_32dp**
+ * where {stringId} contains in a string xml attribute with id **resource_id** and
+ * {%2d} 2 numerical numbers between 00 and 68 included,
  *
  *
  * See *icon-pack-classic* module as sample
@@ -41,6 +42,7 @@ import java.util.*
  * @param packageName Context of the app to retrieve the resources
  * @param resourceId String Id of the pack (ex : com.kunzisoft.keepass.icon.classic.R.string.resource_id)
  */
+@SuppressLint("DiscouragedApi")
 class IconPack(packageName: String, resources: Resources, resourceId: Int) {
 
     private val icons: SparseIntArray = SparseIntArray()