Deprecated features fix2

app/build.gradle.kts

@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.com.android.application)
-    alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
@@ -14,6 +13,9 @@ kotlin {
 android {
     namespace = "protect.card_locker"
     compileSdk = 36
+    androidResources {
+    localeFilters.addAll(listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW"))
+    }
 
     defaultConfig {
         applicationId = "me.hackerchick.catima"
@@ -25,8 +27,6 @@ android {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("boolean", "showDonate", "true")
@@ -38,7 +38,7 @@ android {
         release {
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
@@ -98,6 +98,7 @@ android {
 
     kotlin {
         compilerOptions {
+            languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
             jvmTarget = JvmTarget.JVM_17
         }
     }

app/src/main/java/protect/card_locker/MainActivity.kt

@@ -518,7 +518,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
                     intent.data
                 }
                 Intent.ACTION_SEND -> {
-                    intent.getParcelableExtra(Intent.EXTRA_STREAM)
+                    @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_STREAM)
                 }
                 else -> {
                     Log.e(TAG, "Wrong action type to parse intent")
@@ -815,7 +815,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
 
     private fun scaleScreen() {
         val displayMetrics = DisplayMetrics()
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        @Suppress("DEPRECATION") windowManager.defaultDisplay.getMetrics(displayMetrics)
         val screenHeight = displayMetrics.heightPixels
         val mediumSizePx = TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP,

app/src/main/java/protect/card_locker/Utils.java

@@ -798,13 +798,13 @@ static public <T, U> U mapGetOrDefault(Map<T, U> map, T key, U defaultValue) {
     static public Locale stringToLocale(String localeString) {
         String[] localeParts = localeString.split("-");
         if (localeParts.length == 1) {
-            return new Locale(localeParts[0]);
+            return new Locale.Builder().setLanguage(localeParts[0]).build();
         }
 
         if (localeParts[1].startsWith("r")) {
             localeParts[1] = localeParts[1].substring(1);
         }
-        return new Locale(localeParts[0], localeParts[1]);
+        return new Locale.Builder().setLanguage(localeParts[0]).setRegion(localeParts[1]).build();
     }
 
     static public Context updateBaseContextLocale(Context context) {

app/src/main/res/values-ru/strings.xml

@@ -39,7 +39,7 @@
     <string name="importOptionFilesystemExplanation">Выберете файл в файловой системе</string>
     <string name="importOptionFilesystemButton">Выбрать файл</string>
     <string name="about">О приложении</string>
-    <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+</string>
+    <string name="app_license">Программное обеспечение, распространяемое по лицензии Copyleft (GPLv3+).</string>
     <string name="about_title_fmt">О приложении <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Выбор штрих-кода</string>

build.gradle.kts

@@ -2,7 +2,6 @@
 
 plugins {
     alias(libs.plugins.com.android.application) apply false
-    alias(libs.plugins.org.jetbrains.kotlin.android) apply false
 }
 
 allprojects {

gradle.properties

@@ -15,3 +15,12 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+

gradle/libs.versions.toml

@@ -52,8 +52,7 @@ junit-junit = { group = "junit", name = "junit", version = "4.13.2" }
 org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.16.1" }
 
 [plugins]
-com-android-application = { id = "com.android.application", version = "8.13.2" }
-org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.10" }
+com-android-application = { id = "com.android.application", version = "9.0.1" }
 org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.3.10" }
 
 [bundles]

settings.gradle.kts

@@ -5,6 +5,9 @@ pluginManagement {
         mavenCentral()
     }
 }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {