From 9159665301e1ace90e3f31b76515b160a8d82af1 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Fri, 20 Mar 2026 01:22:30 +0300 Subject: [PATCH] update --- app/build.gradle.kts | 14 +++++++++----- gradle/libs.versions.toml | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 3 +++ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e70d1b8..230ccd4 100755 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + /* * Created by sweetbread * Copyright (c) 2026. All rights reserved. @@ -5,14 +7,13 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) // alias(libs.plugins.ksp) } android { namespace = "ru.risdeveau.pixeldragon" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "ru.risdeveau.pixeldragon" @@ -37,14 +38,17 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } buildFeatures { compose = true } } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} + dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e341f1d..b3aa7d2 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -agp = "8.13.0" -coil = "3.1.0" -jsoup = "1.20.1" +agp = "9.1.0" +coil = "3.4.0" +jsoup = "1.22.1" kotlin = "2.2.21" coreKtx = "1.15.0" junit = "4.13.2" -junitVersion = "1.2.1" -espressoCore = "3.6.1" +junitVersion = "1.3.0" +espressoCore = "3.7.0" kotlinxSerializationJson = "1.7.3" -ktor = "3.1.0" +ktor = "3.4.1" lifecycleRuntimeKtx = "2.8.7" activityCompose = "1.10.0" -composeBom = "2025.02.00" -navigationCompose = "2.8.8" +composeBom = "2026.03.00" +navigationCompose = "2.9.7" room = "2.6.1" splittiesFunPackAndroidBase = "3.0.0" trixnityClient = "5.2.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82c5a3a..be56d25 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -6,6 +6,6 @@ #Thu Feb 20 10:45:47 GMT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 72d62b7..104521f 100755 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {