From 7e7ddd1a336c7b7f4b8c80ffac220577ee191783 Mon Sep 17 00:00:00 2001
From: aleksandrilinskii <aleksandr8693@gmail.com>
Date: Thu, 12 Mar 2026 08:17:50 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20Gradle=20=D0=B8=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                     | 35 +++++++-------
 build.gradle.kts                         |  4 +-
 gradle/gradle-daemon-jvm.properties      |  2 +
 gradle/libs.versions.toml                | 58 ++++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  4 +-
 5 files changed, 56 insertions(+), 47 deletions(-)
 create mode 100644 gradle/gradle-daemon-jvm.properties

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index aa595f2242d..821554dc7ea 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -27,32 +29,29 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-
     buildFeatures {
         buildConfig = true
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
 dependencies {
-    implementation(libs.androidX.core)
-    implementation(libs.androidX.appCompat)
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
 
     // UI layer libraries
-    implementation(libs.ui.material)
-    implementation(libs.ui.constraintLayout)
-
-    // region Unit tests
-    testImplementation(libs.unitTests.junit)
-    // endregion
+    implementation(libs.material)
+    implementation(libs.constraintlayout)
 
-    // region UI tests
-    androidTestImplementation(libs.uiTests.junitExt)
-    androidTestImplementation(libs.uiTests.espressoCore)
-    // endregion
+    testImplementation(libs.junit4)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso.core)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 541a66836c9..bf0c8cbae51 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.4" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.21" apply false
+    id("com.android.application") version "8.12.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.10" apply false
     id("convention.detekt")
 }
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 00000000000..99aaa88dfb0
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+# Gradle Daemon must run on a supported JDK, while the shell may use a newer Java.
+toolchainVersion=21
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4518ee4f7a7..59d04520c29 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,40 +1,48 @@
 [versions]
 
-java = "VERSION_1_8"
-
 # Build constants
+compileSdk = "36"
+java = "VERSION_17"
+material = "1.13.0"
 minSdk = "26"
-compileSdk = "34"
 targetSdk = "33"
 
-# Detekt
-detekt = "1.23.3"
-detektTwitterComposeRules ="0.0.26"
+# AndroidX
+appcompat = "1.7.1"
+constraintlayout = "2.2.1"
+coreKtx = "1.18.0"
 
-[libraries]
+# Testing
+espressoCore = "3.5.1"
+junit4 = "4.13.2"
+junitExt = "1.1.5"
 
-# Detekt
-staticAnalysis-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
-staticAnalysis-detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" }
-staticAnalysis-detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
-staticAnalysis-detektTest = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
-staticAnalysis-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
-staticAnalysis-detektLibraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
-staticAnalysis-detektTwitterComposeRules = { module = "com.twitter.compose.rules:detekt", version.ref = "detektTwitterComposeRules" }
+# Static analysis
+detekt = "1.23.8"
+detektTwitterComposeRules = "0.0.26"
+
+[libraries]
 
 # AndroidX
-androidX-core = "androidx.core:core-ktx:1.12.0"
-androidX-appCompat = "androidx.appcompat:appcompat:1.6.1"
+appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 
-# UI layer libraries
-ui-material = "com.google.android.material:material:1.10.0"
-ui-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
+# UI
+material = { module = "com.google.android.material:material", version.ref = "material" }
 
-# Unit tests
-unitTests-junit = "junit:junit:4.13.2"
+# Testing
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+junit-ext = { module = "androidx.test.ext:junit", version.ref = "junitExt" }
 
-# UI tests
-uiTests-junitExt = "androidx.test.ext:junit:1.1.5"
-uiTests-espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
+# Static analysis
+staticAnalysis-detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
+staticAnalysis-detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" }
+staticAnalysis-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
+staticAnalysis-detektLibraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
+staticAnalysis-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+staticAnalysis-detektTest = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
+staticAnalysis-detektTwitterComposeRules = { module = "com.twitter.compose.rules:detekt", version.ref = "detektTwitterComposeRules" }
 
 [bundles]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4a2256c8011..6e17a475b32 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 12 02:07:38 ALMT 2023
+#Thu Mar 12 07:54:29 CET 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From b3f5cfe38576581993b2ed343f64c63502c86f80 Mon Sep 17 00:00:00 2001
From: aleksandrilinskii <aleksandr8693@gmail.com>
Date: Thu, 12 Mar 2026 08:19:39 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8E=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...20\260\320\272\320\260\320\275\321\201\320\270\320\271.md" | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git "a/API \320\264\320\273\321\217 \320\277\320\276\320\270\321\201\320\272\320\260 \320\262\320\260\320\272\320\260\320\275\321\201\320\270\320\271.md" "b/API \320\264\320\273\321\217 \320\277\320\276\320\270\321\201\320\272\320\260 \320\262\320\260\320\272\320\260\320\275\321\201\320\270\320\271.md"
index b0f81d1eede..5a4d607dfa6 100644
--- "a/API \320\264\320\273\321\217 \320\277\320\276\320\270\321\201\320\272\320\260 \320\262\320\260\320\272\320\260\320\275\321\201\320\270\320\271.md"	
+++ "b/API \320\264\320\273\321\217 \320\277\320\276\320\270\321\201\320\272\320\260 \320\262\320\260\320\272\320\260\320\275\321\201\320\270\320\271.md"	
@@ -5,9 +5,9 @@
 
 ## Документация
 
-С документацией к API для поиска вакансией можно ознакомиться по [этой ссылке](https://practicum-diploma-8bc38133faba.herokuapp.com/docs).
+С документацией к API для поиска вакансией можно ознакомиться по [этой ссылке](https://android-diploma.education-services.ru/docs).
 
 
 ## Получение токена авторизации
 
-Токен для использования API можно получить по [этой ссылке](https://practicum-diploma-8bc38133faba.herokuapp.com/login).
+Токен для использования API можно получить по [этой ссылке](https://android-diploma.education-services.ru/login).