Refactor code to support AGP 9.0

utils/android/build.gradle.kts

@@ -0,0 +1,46 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+android {
+    namespace = "com.pr0gramm3r101.utils"
+    compileSdk = 36
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.adaptive.android)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+
+    implementation(libs.gson)
+}

utils/android/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

utils/shared/.gitignore

@@ -0,0 +1 @@
+/build

utils/shared/build.gradle.kts

@@ -1,10 +1,10 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import com.android.build.api.dsl.androidLibrary
 
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidKotlinMultiplatformLibrary)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.composeCompiler)
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.compose.multiplatform)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.android.kotlin.multiplatform.library)
 }
 
 kotlin {
@@ -16,9 +16,6 @@ kotlin {
         namespace = "com.pr0gramm3r101.utils"
         compileSdk = 36
         minSdk = 24
-
-        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
-        androidResources.enable = true
     }
 
     listOf(
@@ -27,7 +24,7 @@ kotlin {
         iosSimulatorArm64()
     ).forEach {
         it.binaries.framework {
-            baseName = "utils"
+            baseName = "shared"
         }
     }
 
@@ -46,17 +43,12 @@ kotlin {
         }
 
         androidMain.dependencies {
-            implementation(libs.androidx.adaptive.android)
-            implementation(libs.androidx.activity.ktx)
-            implementation(libs.androidx.core.ktx)
-            implementation(libs.androidx.appcompat)
-            implementation(libs.material)
-            implementation(libs.biometric)
-            implementation(libs.gson)
-
             implementation(libs.androidx.adaptive.android)
             implementation(libs.datastore.preferences)
             implementation(libs.datastore.core)
+            implementation(libs.biometric)
+            implementation(libs.androidx.appcompat)
+            implementation(libs.material)
         }
 
         iosMain.dependencies {
@@ -67,6 +59,6 @@ kotlin {
 
 compose.resources {
     publicResClass = true
-    packageOfResClass = "com.pr0gramm3r101.utils"
+    packageOfResClass = "com.pr0gramm3r101.shared"
     generateResClass = auto
 }

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/ui/Icons.kt

@@ -6,11 +6,11 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Language
 import androidx.compose.material.icons.outlined.Language
 import androidx.compose.runtime.Composable
+import com.pr0gramm3r101.shared.Res
+import com.pr0gramm3r101.shared.license
+import com.pr0gramm3r101.shared.siren_filled
+import com.pr0gramm3r101.shared.siren_outlined
 import org.jetbrains.compose.resources.vectorResource
-import com.pr0gramm3r101.utils.Res
-import com.pr0gramm3r101.utils.license
-import com.pr0gramm3r101.utils.siren_filled
-import com.pr0gramm3r101.utils.siren_outlined
 
 inline val Icons.Outlined.Internet get() = Icons.Outlined.Language
 inline val Icons.Filled.Internet get() = Icons.Filled.Language

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/Utils.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UnusedReceiverParameter", "unused", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+@file:Suppress("unused", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
 package com.pr0gramm3r101.utils
 

utils/src/androidMain/res/values-ru/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="show_pw">Показать пароль</string>
-    <string name="hide_pw">Скрыть пароль</string>
-    <string name="smthwentwrong">Что-то пошло не так</string>
-</resources>

utils/src/androidMain/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="show_pw" tools:keep="@string/show_pw">Show password</string>
-    <string name="hide_pw" tools:keep="@string/hide_pw">Hide password</string>
-    <string name="smthwentwrong" tools:keep="@string/smthwentwrong">Something went wrong</string>
-</resources>