Merge pull request #88 from TimPushkin/updates

Prepare to `1.4.2`
TimPushkin · Aug 29, 2024 · d86da02 · d86da02
2 parents 6686c48 + 6401a42
commit d86da02
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,6 +3,7 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.jetbrains.kotlin.plugin.compose)
     alias(libs.plugins.androidx.room)
     alias(libs.plugins.google.dagger.hilt.android)
     alias(libs.plugins.google.devtools.ksp)
@@ -11,7 +12,7 @@ plugins {
 object Version {
     private const val MAJOR = 1
     private const val MINOR = 4
-    private const val PATCH = 1
+    private const val PATCH = 2
 
     const val CODE = MAJOR * 10000 + MINOR * 100 + PATCH
     const val NAME = "$MAJOR.$MINOR.$PATCH"
@@ -26,12 +27,12 @@ kotlin {
 
 android {
     namespace = "ru.spbu.depnav"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "ru.spbu.depnav"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = Version.CODE
         versionName = Version.NAME
 
@@ -67,9 +68,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/app/src/main/java/ru/spbu/depnav/ui/viewmodel/MapViewModel.kt b/app/src/main/java/ru/spbu/depnav/ui/viewmodel/MapViewModel.kt
@@ -20,7 +20,6 @@ package ru.spbu.depnav.ui.viewmodel
 
 import android.util.Log
 import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.text.intl.Locale

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.jetbrains.kotlin.plugin.compose) apply false
 
     // Must be declared in the same scope as AGP to fix https://github.com/google/dagger/issues/3068
     alias(libs.plugins.google.dagger.hilt.android) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
 [versions]
 
-kotlin = "1.9.24"
-kspPlugin = "1.9.24-1.0.20"
-composeCompiler = "1.5.14"
-hilt = "2.51.1"
-lifecycle = "2.8.0"
+kotlin = "2.0.20"
+kspPlugin = "2.0.20-1.0.24"
+hilt = "2.52"
+lifecycle = "2.8.4"
 room = "2.6.1"
 
 
@@ -21,26 +20,27 @@ androidx-room-compiler = { group = "androidx.room", name = "room-compiler", vers
 google-dagger-hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 google-dagger-hiltCompiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
 
-androidx-compose-bom = "androidx.compose:compose-bom:2024.05.00"
+androidx-compose-bom = "androidx.compose:compose-bom:2024.08.00"
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 
 androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
-androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
-plrapps-mapcompose = "ovh.plrapps:mapcompose:2.12.4"
+androidx-activity-compose = "androidx.activity:activity-compose:1.9.1"
+plrapps-mapcompose = "ovh.plrapps:mapcompose:2.12.6"
 
 junit = "junit:junit:4.13.2"
-androidx-test-runner = "androidx.test:runner:1.5.2"
-androidx-test-rules = "androidx.test:rules:1.5.0"
-androidx-test-extJunit = "androidx.test.ext:junit:1.1.5"
+androidx-test-runner = "androidx.test:runner:1.6.2"
+androidx-test-rules = "androidx.test:rules:1.6.1"
+androidx-test-extJunit = "androidx.test.ext:junit:1.2.1"
 
 
 [plugins]
 
-android-application = { id = "com.android.application", version = "8.4.0" }
+android-application = { id = "com.android.application", version = "8.5.2" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 google-dagger-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
 androidx-room = { id = "androidx.room", version.ref = "room" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 17 12:35:02 MSK 2024
+#Tue Aug 27 22:36:14 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists