Merge pull request #89 from stslex/dev

up targetSdk to 36

Author: stslex

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<Project> {
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.apply {
-                    targetSdk = 34
+                    targetSdk = libs.findVersionInt("targetSdk")
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                     consumerProguardFiles("consumer-rules.pro")
                     buildTypes {

build-logic/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.parallel=true
+#org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configureondemand=true

fastlane/report.xml

@@ -5,17 +5,17 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000275576">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000292216">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: clean bundle" time="677.542868698">
+      <testcase classname="fastlane.lanes" name="1: clean bundle" time="711.461636785">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="35.738331201">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="40.300046479">
 
       </testcase>
 

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

gradle/libs.versions.toml

@@ -1,49 +1,49 @@
 [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 = "35"
-compileSdk = "35"
-versionName = "1.77"
-versionCode = "24"
+targetSdk = "36"
+compileSdk = "36"
+versionName = "1.78"
+versionCode = "25"
 
-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" }

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