mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-03 04:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: Upgrade all modules to API 34 #1730

Browse source
This commit is contained in:
J-Jamet 2024-06-24 13:14:52 +02:00
parent f4b7db667f
commit 8d2de40df6
7 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -6,7 +6,6 @@ apply plugin: 'kotlin-kapt'
android { android {
namespace 'com.kunzisoft.keepass' namespace 'com.kunzisoft.keepass'
compileSdkVersion 34 compileSdkVersion 34
buildToolsVersion "33.0.2"
defaultConfig { defaultConfig {
applicationId "com.kunzisoft.keepass" applicationId "com.kunzisoft.keepass"

5
crypto/build.gradle
View file

@ -5,13 +5,12 @@ plugins {
android { android {
namespace 'com.kunzisoft.encrypt' namespace 'com.kunzisoft.encrypt'
compileSdkVersion 33 compileSdkVersion 34
buildToolsVersion "33.0.2"
ndkVersion "21.4.7075529" ndkVersion "21.4.7075529"
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 33 targetSdkVersion 34
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

5
database/build.gradle
View file

@ -3,12 +3,11 @@ apply plugin: 'kotlin-android'
android { android {
namespace 'com.kunzisoft.keepass.database' namespace 'com.kunzisoft.keepass.database'
compileSdkVersion 33 compileSdkVersion 34
buildToolsVersion "33.0.2"
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
targetSdk 33 targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

5
icon-pack/build.gradle
View file

@ -3,12 +3,11 @@ apply plugin: 'kotlin-android'
android { android {
namespace 'com.kunzisoft.keepass.icon' namespace 'com.kunzisoft.keepass.icon'
compileSdkVersion 33 compileSdkVersion 34
buildToolsVersion '33.0.2'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 33 targetSdkVersion 34
} }
compileOptions { compileOptions {

5
icon-pack/classic/build.gradle
View file

@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
android { android {
namespace 'com.kunzisoft.keepass.icon.classic' namespace 'com.kunzisoft.keepass.icon.classic'
compileSdkVersion 33 compileSdkVersion 34
buildToolsVersion '33.0.2'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 33 targetSdkVersion 34
} }
resourcePrefix 'classic_' resourcePrefix 'classic_'

5
icon-pack/material/build.gradle
View file

@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
android { android {
namespace 'com.kunzisoft.keepass.icon.material' namespace 'com.kunzisoft.keepass.icon.material'
compileSdkVersion 33 compileSdkVersion 34
buildToolsVersion '33.0.2'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 33 targetSdkVersion 34
} }
resourcePrefix 'material_' resourcePrefix 'material_'

10
icon-pack/src/main/java/com/kunzisoft/keepass/icon/IconPack.kt
View file

@ -19,18 +19,19 @@
*/ */
package com.kunzisoft.keepass.icon package com.kunzisoft.keepass.icon
import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.res.Resources import android.content.res.Resources
import android.util.SparseIntArray import android.util.SparseIntArray
import java.util.* import java.util.Locale
/** /**
* Class who construct dynamically database icons contains in a separate library * Class who construct dynamically database icons contains in a separate library
* *
* *
* It only supports icons with specific nomenclature **[stringId]_[%2d]_32dp** * It only supports icons with specific nomenclature **{stringId}_{%2d}_32dp**
* where [stringId] contains in a string xml attribute with id **resource_id** and * where {stringId} contains in a string xml attribute with id **resource_id** and
* [%2d] 2 numerical numbers between 00 and 68 included, * {%2d} 2 numerical numbers between 00 and 68 included,
* *
* *
* See *icon-pack-classic* module as sample * 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 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) * @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) { class IconPack(packageName: String, resources: Resources, resourceId: Int) {
private val icons: SparseIntArray = SparseIntArray() private val icons: SparseIntArray = SparseIntArray()