From 1772d9e78072bae00cfa91ffa660cac0f6698588 Mon Sep 17 00:00:00 2001 From: Acclorite <2ma0bhpk@anonaddy.com> Date: Sun, 5 Oct 2025 16:36:59 +0300 Subject: [PATCH] chore: update gradle and dependencies --- .idea/codeStyles/Project.xml | 34 ++++++++++++++++++++ app/build.gradle.kts | 41 +++++++++++++----------- build.gradle.kts | 10 +++--- gradle/wrapper/gradle-wrapper.properties | 4 +-- 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7643783a..9c3d95a7 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,39 @@ + + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0d991f3d..c36c3712 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,3 @@ -import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties - plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -13,25 +11,22 @@ plugins { android { namespace = "ua.acclorite.book_story" - compileSdk = 35 + compileSdk = 36 + // Default configuration defaultConfig { applicationId = "ua.acclorite.book_story" minSdk = 26 - targetSdk = 35 + targetSdk = 36 versionCode = 13 versionName = "1.7.1" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } } - room { - schemaDirectory("$projectDir/schemas") - } - + // Build types configuration buildTypes { getByName("debug") { applicationIdSuffix = ".debug" @@ -50,6 +45,8 @@ android { signingConfig = signingConfigs.getByName("debug") } } + + // Kotlin configuration compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -57,6 +54,15 @@ android { kotlinOptions { jvmTarget = "17" } + + // Room configuration + ksp { + arg("room.schemaLocation", "$projectDir/schemas") + } + room { + schemaDirectory("$projectDir/schemas") + } + buildFeatures { buildConfig = true compose = true @@ -73,17 +79,16 @@ android { } } +// About Libraries configuration aboutLibraries { registerAndroidTasks = false prettyPrint = true - gitHubApiToken = gradleLocalProperties(rootDir, providers)["github-key"] as? String filterVariants = arrayOf("debug", "release", "release-debug") excludeFields = arrayOf("generated", "funding", "description") } dependencies { - // Core implementation("androidx.core:core-ktx:1.16.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") @@ -109,9 +114,9 @@ dependencies { implementation("com.google.accompanist:accompanist-swiperefresh:0.36.0") // Dagger - Hilt - implementation("com.google.dagger:hilt-android:2.55") - ksp("com.google.dagger:hilt-android-compiler:2.55") - implementation("com.google.dagger:hilt-compiler:2.55") + implementation("com.google.dagger:hilt-android:2.57.2") + ksp("com.google.dagger:hilt-android-compiler:2.57.2") + implementation("com.google.dagger:hilt-compiler:2.57.2") ksp("androidx.hilt:hilt-compiler:1.2.0") implementation("androidx.hilt:hilt-navigation-compose:1.2.0") @@ -129,13 +134,13 @@ dependencies { implementation("androidx.core:core-splashscreen:1.0.1") // SAF - implementation("com.anggrayudi:storage:2.0.0") + implementation("com.anggrayudi:storage:2.2.0") // PDF parser implementation("com.tom-roush:pdfbox-android:2.0.27.0") // EPUB parser - implementation("org.jsoup:jsoup:1.18.3") + implementation("org.jsoup:jsoup:1.21.2") // Language Switcher implementation("androidx.appcompat:appcompat:1.7.1") @@ -155,8 +160,8 @@ dependencies { implementation("com.github.nanihadesuka:LazyColumnScrollbar:2.2.0") // Markdown - implementation("org.commonmark:commonmark:0.24.0") + implementation("org.commonmark:commonmark:0.26.0") // Json - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b98caf0b..d9b13fa5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("com.android.application") version "8.7.3" apply false - id("org.jetbrains.kotlin.android") version "2.1.10" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.1.10" apply false - id("com.google.devtools.ksp") version "2.1.10-1.0.30" apply false - id("com.google.dagger.hilt.android") version "2.52" apply false + id("com.android.application") version "8.13.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" apply false + id("com.google.devtools.ksp") version "2.2.0-2.0.2" apply false + id("com.google.dagger.hilt.android") version "2.57.2" apply false id("com.mikepenz.aboutlibraries.plugin") version "11.1.3" apply false id("androidx.room") version "2.6.1" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 296a3208..5e9c2692 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME