обновлены все либы

This commit is contained in:
2026-04-16 19:59:49 +03:00
parent 00ea56e204
commit 879d2ded3b
6 changed files with 36 additions and 38 deletions

View File

@@ -1,6 +1,5 @@
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler) alias(libs.plugins.compose.compiler)
alias(libs.plugins.dagger.hilt) alias(libs.plugins.dagger.hilt)
alias(libs.plugins.ksp) alias(libs.plugins.ksp)
@@ -8,7 +7,7 @@ plugins {
android { android {
namespace = "com.github.nullptroma.wallenc.app" namespace = "com.github.nullptroma.wallenc.app"
compileSdk = 35 compileSdk = 37
defaultConfig { defaultConfig {
applicationId = "com.github.nullptroma.wallenc.app" applicationId = "com.github.nullptroma.wallenc.app"
@@ -38,9 +37,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = "17"
}
buildFeatures { buildFeatures {
compose = true compose = true
} }
@@ -52,6 +49,10 @@ android {
} }
} }
kotlin {
jvmToolchain(17)
}
dependencies { dependencies {
// Timber // Timber
implementation(libs.timber) implementation(libs.timber)

View File

@@ -1,12 +1,11 @@
plugins { plugins {
alias(libs.plugins.android.library) alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp) alias(libs.plugins.ksp)
} }
android { android {
namespace = "com.github.nullptroma.wallenc.data" namespace = "com.github.nullptroma.wallenc.data"
compileSdk = 35 compileSdk = 37
defaultConfig { defaultConfig {
minSdk = 26 minSdk = 26
@@ -28,9 +27,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions { }
jvmTarget = "17"
} kotlin {
jvmToolchain(17)
} }
dependencies { dependencies {

View File

@@ -1,3 +1,2 @@
#This file is generated by updateDaemonJvm #This file is generated by updateDaemonJvm
toolchainVendor=jetbrains
toolchainVersion=21 toolchainVersion=21

View File

@@ -1,27 +1,27 @@
[versions] [versions]
agp = "8.13.2" agp = "9.1.1"
jacksonModuleKotlin = "2.18.2" jacksonModuleKotlin = "2.21.2"
kotlin = "2.0.20" kotlin = "2.3.20"
coreKtx = "1.15.0" coreKtx = "1.18.0"
junit = "4.13.2" junit = "4.13.2"
junitVersion = "1.2.1" junitVersion = "1.3.0"
espressoCore = "3.6.1" espressoCore = "3.7.0"
kotlinReflect = "2.0.21" kotlinReflect = "2.2.21"
kotlinxCoroutinesCore = "1.9.0" kotlinxCoroutinesCore = "1.10.2"
kotlinxSerializationJson = "1.7.3" kotlinxSerializationJson = "1.11.0"
lifecycleRuntimeKtx = "2.8.7" lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.10.0" activityCompose = "1.13.0"
composeBom = "2025.01.00" composeBom = "2026.03.01"
navigation = "2.8.5" navigation = "2.9.7"
hiltNavigation = "1.2.0" hiltNavigation = "1.3.0"
timber = "5.0.1" timber = "5.0.1"
yandexAuthSdk = "3.1.2" yandexAuthSdk = "3.2.0"
daggerHilt = "2.52" daggerHilt = "2.59.2"
ksp = "2.0.20-1.0.25" ksp = "2.3.6"
room = "2.6.1" room = "2.8.4"
retrofit = "2.11.0" retrofit = "3.0.0"
appcompat = "1.7.0" appcompat = "1.7.1"
material = "1.12.0" material = "1.13.0"
[libraries] [libraries]
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" } jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }

View File

@@ -1,6 +1,6 @@
#Sat Sep 07 01:04:14 MSK 2024 #Sat Sep 07 01:04:14 MSK 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -1,6 +1,5 @@
plugins { plugins {
alias(libs.plugins.android.library) alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler) alias(libs.plugins.compose.compiler)
alias(libs.plugins.dagger.hilt) alias(libs.plugins.dagger.hilt)
alias(libs.plugins.jetbrains.kotlin.serialization) alias(libs.plugins.jetbrains.kotlin.serialization)
@@ -10,7 +9,7 @@ plugins {
android { android {
namespace = "com.github.nullptroma.wallenc.presentation" namespace = "com.github.nullptroma.wallenc.presentation"
compileSdk = 34 compileSdk = 37
defaultConfig { defaultConfig {
minSdk = 24 minSdk = 24
@@ -32,9 +31,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = "17"
}
buildFeatures { buildFeatures {
compose = true compose = true
} }
@@ -46,6 +43,7 @@ android {
} }
} }
dependencies { dependencies {
implementation(libs.navigation) implementation(libs.navigation)
implementation(libs.navigation.hilt.compose) implementation(libs.navigation.hilt.compose)