From bf630901790ca5395144e8804a2be283d79c06d6 Mon Sep 17 00:00:00 2001 From: stslex Date: Tue, 26 Aug 2025 23:28:42 +0300 Subject: [PATCH 1/3] up targetSdk to 36 --- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 4 ++-- gradle.properties | 3 ++- gradle/libs.versions.toml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 622e65de..4e7c9427 100644 --- a/build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -1,4 +1,4 @@ -import AppExt.findPluginId +import AppExt.findVersionInt import AppExt.libs import com.android.build.gradle.LibraryExtension import org.gradle.api.Plugin @@ -23,7 +23,7 @@ class AndroidLibraryConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) defaultConfig.apply { - targetSdk = 34 + targetSdk = libs.findVersionInt("targetSdk") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") buildTypes { diff --git a/gradle.properties b/gradle.properties index 2cbd6d19..9b0fdc7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xms4g -Xmx18g -Dfile.encoding\=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx18g -XX:+UseG1GC -XX:MaxGCPauseMillis=400 -Dfile.encoding=UTF-8 +kotlin.daemon.jvmargs=-Xms2g -Xmx18g # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 824d6e4d..0f28b51b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,8 @@ androidGradlePlugin = "8.8.1" androidTools = "31.8.1" minSdk = "28" -targetSdk = "35" -compileSdk = "35" +targetSdk = "36" +compileSdk = "36" versionName = "1.77" versionCode = "24" From 4bf5fbcd0a4af7275dc8bb003e61b6e9a51b01f2 Mon Sep 17 00:00:00 2001 From: stslex Date: Tue, 26 Aug 2025 23:37:44 +0300 Subject: [PATCH 2/3] update all libraries --- build-logic/gradle.properties | 2 +- gradle/libs.versions.toml | 62 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties index 6977b719..d8e073e8 100644 --- a/build-logic/gradle.properties +++ b/build-logic/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.parallel=true +#org.gradle.parallel=true org.gradle.caching=true org.gradle.configureondemand=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0f28b51b..fcec703d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -androidDesugarJdkLibs = "2.1.4" -kotlin = "2.1.0" -androidGradlePlugin = "8.8.1" -androidTools = "31.8.1" +androidDesugarJdkLibs = "2.1.5" +kotlin = "2.2.10" +androidGradlePlugin = "8.12.1" +androidTools = "31.12.1" minSdk = "28" targetSdk = "36" @@ -10,40 +10,40 @@ compileSdk = "36" versionName = "1.77" versionCode = "24" -ktx = "1.15.0" +ktx = "1.17.0" material = "1.12.0" -appcompat = "1.7.0" -immutableCollection = "0.3.5" -lifecycle = "2.8.7" -coroutines = "1.9.0" +appcompat = "1.7.1" +immutableCollection = "0.4.0" +lifecycle = "2.9.2" +coroutines = "1.10.2" -composeBom = "2025.02.00" -composeGradle = "1.7.0" -composeNavigation = "2.8.7" -accompanist = "0.30.0" -coil = "3.0.2" -composeActivity = "1.10.0" +composeBom = "2025.08.00" +composeGradle = "1.8.2" +composeNavigation = "2.9.3" +accompanist = "0.36.0" +coil = "3.3.0" +composeActivity = "1.10.1" -koin = "4.0.0" -koinKsp = "1.4.0" +koin = "4.1.0" +koinKsp = "2.1.0" -ktor = "3.0.3" -okhttp3 = "4.12.0" +ktor = "3.2.3" +okhttp3 = "5.1.0" junit = "4.13.2" -androidxJunit = "1.2.1" -espresso = "3.6.1" -robolectric = "4.9" -androidxTest = "1.6.1" - -room = "2.6.1" -ksp = "2.1.0-1.0.28" -mockito = "2.19.0" -vkompose = "0.7" -serialization = "1.7.3" +androidxJunit = "1.3.0" +espresso = "3.7.0" +robolectric = "4.16" +androidxTest = "1.7.0" + +room = "2.7.2" +ksp = "2.2.10-2.0.2" +mockito = "5.19.0" +vkompose = "0.7.1" +serialization = "1.9.0" paging = "3.3.6" -slf4j = "1.7.9" -coroutineTest = "1.9.0" +slf4j = "2.0.17" +coroutineTest = "1.10.2" [libraries] android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 602fd5bf..a9f09454 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Feb 15 09:17:21 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 0e36141b233571509758f8f97c1bedec1f5e6daf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 21:32:36 +0000 Subject: [PATCH 3/3] update version --- fastlane/report.xml | 6 +++--- gradle/libs.versions.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fastlane/report.xml b/fastlane/report.xml index 1582ee6a..a6503820 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fcec703d..b927f4ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,8 +7,8 @@ androidTools = "31.12.1" minSdk = "28" targetSdk = "36" compileSdk = "36" -versionName = "1.77" -versionCode = "24" +versionName = "1.78" +versionCode = "25" ktx = "1.17.0" material = "1.12.0"