Upgrade Kotlin deps
This commit is contained in:
1 parent
dbe455350d
commit
ab2c60824a
5 files changed
+32
-28
No files matched your search
@@ -20,7 +20,7 @@ internal fun KotlinCommonCompilerOptions.configureKotlin(includeKotlinX: Boolean
|
|||||||
"kotlinx.serialization.ExperimentalSerializationApi",
|
"kotlinx.serialization.ExperimentalSerializationApi",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
freeCompilerArgs.addAll("-Xcollection-literals", "-Xwhen-expressions=indy")
|
freeCompilerArgs.addAll("-Xcollection-literals")
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun KotlinCommonCompilerOptions.configureKotlinCompose() {
|
internal fun KotlinCommonCompilerOptions.configureKotlinCompose() {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import androidx.compose.material3.Slider
|
|||||||
import androidx.compose.material3.SliderColors
|
import androidx.compose.material3.SliderColors
|
||||||
import androidx.compose.material3.SliderDefaults
|
import androidx.compose.material3.SliderDefaults
|
||||||
import androidx.compose.material3.SliderDefaults.drawStopIndicator
|
import androidx.compose.material3.SliderDefaults.drawStopIndicator
|
||||||
|
import androidx.compose.material3.rememberSliderState
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -29,18 +30,18 @@ fun Slider(
|
|||||||
colors: SliderColors = SliderDefaults.colors(),
|
colors: SliderColors = SliderDefaults.colors(),
|
||||||
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
|
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
|
||||||
) {
|
) {
|
||||||
|
val state = rememberSliderState(value.toFloat(), steps, valueRange.first.toFloat()..valueRange.last.toFloat())
|
||||||
Slider(
|
Slider(
|
||||||
value = value.toFloat(),
|
state = state,
|
||||||
onValueChange = { onValueChange(it.fastRoundToInt()) },
|
onValueChange = { onValueChange(it.fastRoundToInt()) },
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
enabled = enabled,
|
enabled = enabled,
|
||||||
onValueChangeFinished = onValueChangeFinished,
|
onValueChangeFinished = onValueChangeFinished,
|
||||||
colors = colors,
|
colors = colors,
|
||||||
interactionSource = interactionSource,
|
interactionSource = interactionSource,
|
||||||
steps = steps,
|
track = { state ->
|
||||||
track = { sliderState ->
|
|
||||||
SliderDefaults.Track(
|
SliderDefaults.Track(
|
||||||
sliderState = sliderState,
|
sliderState = state,
|
||||||
trackCornerSize = Dp.Unspecified,
|
trackCornerSize = Dp.Unspecified,
|
||||||
enabled = enabled,
|
enabled = enabled,
|
||||||
colors = colors,
|
colors = colors,
|
||||||
@@ -53,7 +54,6 @@ fun Slider(
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
valueRange = valueRange.first.toFloat()..valueRange.last.toFloat(),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+18
-18
@@ -1,43 +1,43 @@
|
|||||||
[versions]
|
[versions]
|
||||||
aboutlibraries = "14.2.1"
|
aboutlibraries = "14.2.1"
|
||||||
accompanist = "0.37.3"
|
accompanist = "0.37.3"
|
||||||
agp = "9.3.1"
|
agp = "9.4.1"
|
||||||
androidx-activity = "1.13.0"
|
androidx-activity = "1.13.0"
|
||||||
androidx-appcompat = "1.8.0"
|
androidx-appcompat = "1.8.0"
|
||||||
androidx-biometric = "1.4.0-alpha07"
|
androidx-biometric = "1.4.0-alpha07"
|
||||||
androidx-browser = "1.10.0"
|
androidx-browser = "1.10.0"
|
||||||
androidx-core = "1.19.0"
|
androidx-core = "1.19.1"
|
||||||
androidx-core-splashscreen = "1.2.0"
|
androidx-core-splashscreen = "1.2.0"
|
||||||
androidx-datastore = "1.2.1"
|
androidx-datastore = "1.2.1"
|
||||||
androidx-lifecycle = "2.11.0"
|
androidx-lifecycle = "2.11.0"
|
||||||
androidx-paging = "3.5.1"
|
androidx-paging = "3.5.1"
|
||||||
androidx-room = "2.8.4"
|
androidx-room = "2.8.5"
|
||||||
androidx-webkit = "1.17.0"
|
androidx-webkit = "1.17.1"
|
||||||
androidx-work = "2.11.2"
|
androidx-work = "2.12.0"
|
||||||
arrow = "2.2.3"
|
arrow = "2.2.3"
|
||||||
coil = "3.5.0"
|
coil = "3.6.3"
|
||||||
compose-bom = "2026.08.00"
|
compose-bom = "2026.09.01"
|
||||||
compose-multiplatform = "1.11.1"
|
compose-multiplatform = "1.12.1"
|
||||||
compose-destinations = "2.3.0"
|
compose-destinations = "2.3.0"
|
||||||
compose-preference = "2.2.0"
|
compose-preference = "2.2.0"
|
||||||
java = "25"
|
java = "25"
|
||||||
kotlin = "2.4.10"
|
kotlin = "2.4.20"
|
||||||
kotlinx-coroutines = "1.11.0"
|
kotlinx-coroutines = "1.11.0"
|
||||||
kotlinx-datetime = "0.8.0"
|
kotlinx-datetime = "0.8.0"
|
||||||
kotlinx-io = "0.9.1"
|
kotlinx-io = "0.9.1"
|
||||||
kotlinx-serialization = "1.11.0"
|
kotlinx-serialization = "1.11.0"
|
||||||
ksp = "2.3.9"
|
ksp = "2.3.9"
|
||||||
ktor = "3.5.2"
|
ktor = "3.6.0"
|
||||||
moko-resources = "0.26.4"
|
moko-resources = "0.27.1"
|
||||||
okhttp = "5.5.0"
|
okhttp = "5.5.0"
|
||||||
okio = "3.18.1"
|
okio = "3.18.2"
|
||||||
splitties = "3.0.0"
|
splitties = "3.0.0"
|
||||||
spotless = "8.10.0"
|
spotless = "8.10.3"
|
||||||
telephoto = "0.19.0"
|
telephoto = "0.19.0"
|
||||||
xmlutil = "1.0.2"
|
xmlutil = "1.0.2.1"
|
||||||
junit = "1.3.0"
|
junit = "1.3.0"
|
||||||
uiautomator = "2.4.0"
|
uiautomator = "2.4.0"
|
||||||
benchmark = "1.5.0-rc01"
|
benchmark = "1.5.0"
|
||||||
profileinstaller = "1.4.1"
|
profileinstaller = "1.4.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
@@ -78,7 +78,7 @@ compose-bom = { module = "androidx.compose:compose-bom-alpha", version.ref = "co
|
|||||||
compose-foundation = { module = "androidx.compose.foundation:foundation" }
|
compose-foundation = { module = "androidx.compose.foundation:foundation" }
|
||||||
compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version = "1.7.3" }
|
compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version = "1.7.3" }
|
||||||
compose-material3 = { module = "org.jetbrains.compose.material3:material3", version = "1.9.0" }
|
compose-material3 = { module = "org.jetbrains.compose.material3:material3", version = "1.9.0" }
|
||||||
compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version = "1.2.0" }
|
compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version = "1.3.0" }
|
||||||
compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "compose-multiplatform" }
|
compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "compose-multiplatform" }
|
||||||
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
|
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
|
||||||
compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose-multiplatform" }
|
compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose-multiplatform" }
|
||||||
@@ -89,11 +89,11 @@ compose-destinations-compiler = { module = "io.github.raamcosta.compose-destinat
|
|||||||
compose-preference = { module = "me.zhanghai.compose.preference:preference", version.ref = "compose-preference" }
|
compose-preference = { module = "me.zhanghai.compose.preference:preference", version.ref = "compose-preference" }
|
||||||
|
|
||||||
material-motion-core = "io.github.fornewid:material-motion-compose-core:2.0.1"
|
material-motion-core = "io.github.fornewid:material-motion-compose-core:2.0.1"
|
||||||
material-kolor = "com.materialkolor:material-kolor:5.0.0"
|
material-kolor = "com.materialkolor:material-kolor:5.0.1"
|
||||||
|
|
||||||
desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
|
desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
|
||||||
|
|
||||||
diff = "io.github.petertrr:kotlin-multiplatform-diff:1.3.0"
|
diff = "io.github.petertrr:kotlin-multiplatform-diff:1.4.0"
|
||||||
|
|
||||||
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
||||||
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
retries=0
|
retries=0
|
||||||
retryBackOffMs=500
|
retryBackOffMs=500
|
||||||
|
|||||||
+7
-3
@@ -28,14 +28,18 @@ dependencyResolutionManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.android.settings") version "9.3.1"
|
id("com.android.settings") version "9.4.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk = 37
|
compileSdk {
|
||||||
|
version = release(37) {
|
||||||
|
minorApiLevel = 2
|
||||||
|
}
|
||||||
|
}
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
ndkVersion = "29.0.14206865"
|
ndkVersion = "30.0.16248370"
|
||||||
buildToolsVersion = "37.0.0"
|
buildToolsVersion = "37.0.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user