From 26c4efedc7516581887f19ffde116058e16e6978 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Sat, 14 Feb 2026 22:55:14 +0300 Subject: [PATCH] deps: bump --- app/build.gradle.kts | 15 +++++++--- build.gradle.kts | 4 +-- gradle.properties | 14 +++++++-- gradle/libs.versions.toml | 36 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 +-- 5 files changed, 45 insertions(+), 28 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 891b8bd..15fa898 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,6 @@ // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE). +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.Properties @@ -27,7 +28,6 @@ android { targetSdk = 36 versionCode = 1 versionName = "1.0" - setProperty("archivesBaseName", "$applicationId-v$versionCode($versionName)") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -76,9 +76,6 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" - } buildFeatures { compose = true viewBinding = true @@ -94,6 +91,16 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } +} + +base { + archivesName = "ru.sweetbread.unn-v${android.defaultConfig.versionCode}(${android.defaultConfig.versionName})" +} + dependencies { implementation(libs.androidx.material.icons.core.android) coreLibraryDesugaring(libs.desugar.jdk.libs) diff --git a/build.gradle.kts b/build.gradle.kts index bcf14e5..c84e1ef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ -// Copyright (c) 2025 Gleb Zaharov. License: GPLv3 (see LICENSE). +// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE). // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.jetbrainsKotlinAndroid) apply false alias(libs.plugins.kotlin.compose) apply false - id("com.google.devtools.ksp") version "2.1.20-2.0.0" apply false + id("com.google.devtools.ksp") version "2.3.2" apply false } buildscript { diff --git a/gradle.properties b/gradle.properties index aaf839e..416fc40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2025 Gleb Zaharov. License: GPLv3 (see LICENSE). +# Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE). # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: @@ -22,4 +22,14 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be26fc3..0f2e409 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] -agp = "8.7.3" +agp = "9.0.1" coilCompose = "2.7.0" -compose = "1.8.0" -coreSplashscreen = "1.0.1" -datastorePreferences = "1.1.5" +compose = "1.10.3" +coreSplashscreen = "1.2.0" +datastorePreferences = "1.2.0" desugar_jdk_libs = "2.1.5" -kotlin = "2.1.20" -coreKtx = "1.16.0" -junitVersion = "1.2.1" -espressoCore = "3.6.1" -ktor = "2.3.12" -lifecycle = "2.8.7" -activityCompose = "1.10.1" -composeBom = "2025.04.01" -appcompat = "1.7.0" -material = "1.12.0" +kotlin = "2.3.10" +coreKtx = "1.17.0" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +ktor = "3.4.0" +lifecycle = "2.10.0" +activityCompose = "1.12.4" +composeBom = "2026.02.00" +appcompat = "1.7.1" +material = "1.13.0" annotation = "1.9.1" constraintlayout = "2.2.1" -activity = "1.10.1" -navigationCompose = "2.8.9" -roomRuntime = "2.7.1" +activity = "1.12.4" +navigationCompose = "2.9.7" +roomRuntime = "2.8.4" secretsGradlePlugin = "2.0.1" -sentryAndroid = "8.12.0" +sentryAndroid = "8.32.0" splitties = "3.0.0" materialIconsCoreAndroid = "1.7.8" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 89007cd..b7570a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ -# Copyright (c) 2025 Gleb Zaharov. License: GPLv3 (see LICENSE). +# Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE). #Sat Mar 16 18:30:45 MSK 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists