day2_commit_1_fixed_gradle

This commit is contained in:
Terebov_Maksim 2025-02-19 10:03:53 +03:00
parent 682eb972cc
commit 68a936c899
4 changed files with 49 additions and 46 deletions

View File

@ -1,9 +1,9 @@
plugins { plugins {
kotlinAndroid id("com.android.application")
androidApplication id("org.jetbrains.kotlin.android")
jetbrainsKotlinSerialization version Version.Kotlin.language id("org.jetbrains.kotlin.plugin.serialization") version Version.Kotlin.language
kotlinAnnotationProcessor id("kotlin-kapt")
id("com.google.dagger.hilt.android").version("2.51.1") id("com.google.dagger.hilt.android") version "2.51.1"
} }
val packageName = "ru.myitschool.work" val packageName = "ru.myitschool.work"
@ -24,8 +24,6 @@ android {
buildFeatures.viewBinding = true buildFeatures.viewBinding = true
compileOptions { compileOptions {
sourceCompatibility = Version.Kotlin.javaSource sourceCompatibility = Version.Kotlin.javaSource
targetCompatibility = Version.Kotlin.javaSource targetCompatibility = Version.Kotlin.javaSource
@ -41,6 +39,10 @@ dependencies {
implementation("com.squareup.retrofit2:converter-gson:2.9.0") implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.okhttp3:okhttp:4.9.0") implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("com.github.bumptech.glide:glide:4.15.1") implementation("com.github.bumptech.glide:glide:4.15.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.10.0")
implementation("androidx.activity:activity:1.10.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
kapt("com.github.bumptech.glide:compiler:4.15.1") kapt("com.github.bumptech.glide:compiler:4.15.1")
defaultLibrary() defaultLibrary()
@ -55,7 +57,6 @@ dependencies {
implementation(Dependencies.Retrofit.library) implementation(Dependencies.Retrofit.library)
implementation(Dependencies.Retrofit.gsonConverter) implementation(Dependencies.Retrofit.gsonConverter)
implementation("com.squareup.picasso:picasso:2.8") implementation("com.squareup.picasso:picasso:2.8")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
implementation("androidx.datastore:datastore-preferences:1.1.1") implementation("androidx.datastore:datastore-preferences:1.1.1")

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools"> <!-- Минимальная и целевая версия SDK по тз (28 и 34) -->
<!-- Минимальная и целевая версия SDK по тз (28 и 34) -->
<uses-sdk <uses-sdk
android:minSdkVersion="28" android:minSdkVersion="28"
android:targetSdkVersion="34" /> android:targetSdkVersion="34" />
@ -13,11 +11,11 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:allowBackup="false"
android:fullBackupOnly="false"
android:name=".App" android:name=".App"
android:allowBackup="false"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:fullBackupOnly="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"
@ -25,6 +23,9 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Default" android:theme="@style/Theme.Default"
tools:targetApi="34"> tools:targetApi="34">
<activity
android:name=".ui.register.RegisterActivity"
android:exported="false" />
<activity <activity
android:name=".ui.RootActivity" android:name=".ui.RootActivity"
android:exported="true"> android:exported="true">

View File

@ -4,5 +4,6 @@ plugins {
kotlinJvm version Version.Kotlin.language apply false kotlinJvm version Version.Kotlin.language apply false
kotlinAnnotationProcessor version Version.Kotlin.language apply false kotlinAnnotationProcessor version Version.Kotlin.language apply false
id("com.google.dagger.hilt.android") version "2.51.1" apply false id("com.google.dagger.hilt.android") version "2.51.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.24" apply false
} }