Sfoglia il codice sorgente

updated kotlin and compose version

sirekanian 2 anni fa
parent
commit
d2dcce04b9

+ 4 - 4
app/build.gradle

@@ -33,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
@@ -62,7 +62,7 @@ dependencies {
 
     // androidx compose
     implementation "androidx.compose.material:material:$composeMaterialVersion"
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.0'
 
     // androidx room
     //noinspection GradleDependency

+ 1 - 1
app/src/main/java/com/sirekanian/warmongr/MainActivity.kt

@@ -40,7 +40,7 @@ class MainActivity : ComponentActivity() {
             ) {
                 value = presenter.getTags()
             }
-            val hasData by derivedStateOf { data.isNotEmpty() }
+            val hasData by remember { derivedStateOf { data.isNotEmpty() } }
             BackHandler(enabled = state.search.isOpened) {
                 state.search.isOpened = false
             }

+ 4 - 6
app/src/main/java/com/sirekanian/warmongr/ext/Modifier.kt

@@ -1,16 +1,14 @@
 package com.sirekanian.warmongr.ext
 
+import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
 
 fun Modifier.pointerInputOnDown(key: Any?, onDownEvent: () -> Unit): Modifier =
     pointerInput(key) {
-        forEachGesture {
-            awaitPointerEventScope {
-                awaitFirstDown(requireUnconsumed = false)
-                onDownEvent()
-            }
+        awaitEachGesture {
+            awaitFirstDown(requireUnconsumed = false)
+            onDownEvent()
         }
     }

+ 3 - 3
build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
         androidPluginVersion = '7.4.2'
-        kotlinVersion = '1.7.20'
-        composeCompilerVersion = '1.3.2'
-        composeMaterialVersion = '1.3.1'
+        kotlinVersion = '1.8.10'
+        composeCompilerVersion = '1.4.4'
+        composeMaterialVersion = '1.4.1'
         roomVersion = '2.4.3'
         ktorVersion = '2.1.0'
     }