Update dependencies (#474)

features/apps/ui/src/main/kotlin/com/nasdroid/apps/ui/DI.kt

@@ -6,7 +6,7 @@ import com.nasdroid.apps.ui.discover.details.AvailableAppDetailsViewModel
 import com.nasdroid.apps.ui.installed.details.InstalledAppDetailsViewModel
 import com.nasdroid.apps.ui.installed.overview.InstalledAppsOverviewViewModel
 import com.nasdroid.apps.ui.installed.overview.logs.LogsViewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

features/auth/ui/src/main/kotlin/com/nasdroid/auth/ui/DI.kt

@@ -4,7 +4,7 @@ import com.nasdroid.auth.logic.AuthLogicModule
 import com.nasdroid.auth.ui.register.RegisterServerViewModel
 import com.nasdroid.auth.ui.selector.ServerSelectorViewModel
 import com.nasdroid.auth.ui.serverselect.SelectServerViewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

features/dashboard/ui/src/main/kotlin/com/nasdroid/dashboard/ui/DI.kt

@@ -6,7 +6,7 @@ import com.nasdroid.dashboard.ui.overview.cpu.CpuOverviewViewModel
 import com.nasdroid.dashboard.ui.overview.memory.MemoryOverviewViewModel
 import com.nasdroid.dashboard.ui.overview.network.NetworkOverviewViewModel
 import com.nasdroid.dashboard.ui.overview.system.SystemInformationOverviewViewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

features/dashboard/ui/src/main/kotlin/com/nasdroid/dashboard/ui/overview/network/NetworkOverview.kt

@@ -32,13 +32,15 @@ import com.nasdroid.dashboard.ui.overview.common.OverviewItemListItem
 import com.nasdroid.design.MaterialThemeExt
 import com.nasdroid.skeleton.skeleton
 import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
-import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottomAxis
-import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStartAxis
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottom
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStart
 import com.patrykandpatrick.vico.compose.cartesian.layer.rememberColumnCartesianLayer
 import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.common.ProvideVicoTheme
 import com.patrykandpatrick.vico.compose.common.component.rememberTextComponent
 import com.patrykandpatrick.vico.compose.m3.common.rememberM3VicoTheme
+import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
+import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
 import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModel
 import com.patrykandpatrick.vico.core.cartesian.data.ColumnCartesianLayerModel
 import org.koin.androidx.compose.koinViewModel
@@ -165,12 +167,12 @@ internal fun AdapterInfo(
                 CartesianChartHost(
                     chart = rememberCartesianChart(
                         rememberColumnCartesianLayer(),
-                        startAxis = rememberStartAxis(
+                        startAxis = VerticalAxis.rememberStart(
                             title = stringResource(R.string.network_data_rate_unit),
                             titleComponent = rememberTextComponent(color = LocalContentColor.current)
                         ),
-                        bottomAxis = rememberBottomAxis(
-                            valueFormatter = { value, _, _ ->
+                        bottomAxis = HorizontalAxis.rememberBottom(
+                            valueFormatter = { _, value, _ ->
                                 if (value == 0.0) {
                                     context.getString(R.string.network_outgoing_label)
                                 } else {

features/power/ui/src/main/kotlin/com/nasdroid/power/ui/DI.kt

@@ -1,7 +1,7 @@
 package com.nasdroid.power.ui
 
 import com.nasdroid.power.logic.PowerLogicModule
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

features/reporting/ui/src/main/kotlin/com/nasdroid/reporting/ui/DI.kt

@@ -2,7 +2,7 @@ package com.nasdroid.reporting.ui
 
 import com.nasdroid.reporting.logic.ReportingLogicModule
 import com.nasdroid.reporting.ui.overview.ReportingOverviewViewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

features/reporting/ui/src/main/kotlin/com/nasdroid/reporting/ui/overview/Graphs.kt

@@ -21,26 +21,24 @@ import com.nasdroid.reporting.logic.graph.Graph
 import com.nasdroid.reporting.logic.graph.PercentageGraph
 import com.nasdroid.reporting.logic.graph.TemperatureGraph
 import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
-import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottomAxis
-import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStartAxis
-import com.patrykandpatrick.vico.compose.cartesian.fullWidth
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottom
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStart
 import com.patrykandpatrick.vico.compose.cartesian.layer.rememberLineCartesianLayer
 import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.cartesian.rememberVicoScrollState
 import com.patrykandpatrick.vico.compose.cartesian.rememberVicoZoomState
 import com.patrykandpatrick.vico.compose.common.ProvideVicoTheme
-import com.patrykandpatrick.vico.compose.common.component.rememberShapeComponent
 import com.patrykandpatrick.vico.compose.common.component.rememberTextComponent
 import com.patrykandpatrick.vico.compose.common.component.shapeComponent
 import com.patrykandpatrick.vico.compose.common.data.rememberExtraLambda
 import com.patrykandpatrick.vico.compose.common.rememberHorizontalLegend
 import com.patrykandpatrick.vico.compose.common.vicoTheme
 import com.patrykandpatrick.vico.compose.m3.common.rememberM3VicoTheme
-import com.patrykandpatrick.vico.core.cartesian.HorizontalLayout
 import com.patrykandpatrick.vico.core.cartesian.Scroll
 import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
-import com.patrykandpatrick.vico.core.cartesian.data.AxisValueOverrider
+import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
 import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModelProducer
+import com.patrykandpatrick.vico.core.cartesian.data.CartesianLayerRangeProvider
 import com.patrykandpatrick.vico.core.cartesian.data.CartesianValueFormatter
 import com.patrykandpatrick.vico.core.cartesian.data.lineSeries
 import com.patrykandpatrick.vico.core.common.LegendItem
@@ -250,29 +248,29 @@ internal fun <T> VicoGraph(
                 modelProducer = modelProducer,
                 chart = rememberCartesianChart(
                     rememberLineCartesianLayer(
-                        axisValueOverrider = remember(constraintAtZero) {
+                        rangeProvider = remember(constraintAtZero) {
                             if (constraintAtZero) {
-                                AxisValueOverrider.auto()
+                                CartesianLayerRangeProvider.auto()
                             } else {
                                 autoNoConstraints()
                             }
-                        }
+                        },
                     ),
-                    startAxis = rememberStartAxis(
+                    startAxis = VerticalAxis.rememberStart(
                         title = verticalLabel,
                         titleComponent = rememberTextComponent(),
                         valueFormatter = verticalAxisValueFormatter,
                     ),
-                    bottomAxis = rememberBottomAxis(
-                        valueFormatter = { value, _, _ ->
+                    bottomAxis = HorizontalAxis.rememberBottom(
+                        valueFormatter = { _, value, _ ->
                             graph.dataSlices.getOrNull(value.toInt())?.timestamp
                                 ?.toLocalDateTime(TimeZone.currentSystemDefault())
                                 ?.let {
                                     timeFormatter.format(it)
                                 }
                                 .orEmpty()
                         },
-                        itemPlacer = remember { HorizontalAxis.ItemPlacer.default(spacing = 2) }
+                        itemPlacer = remember { HorizontalAxis.ItemPlacer.aligned(spacing = 2) }
                     ),
                     legend = rememberHorizontalLegend(
                         items = rememberExtraLambda {
@@ -302,8 +300,8 @@ internal fun <T> VicoGraph(
     }
 }
 
-internal fun autoNoConstraints(): AxisValueOverrider =
-    object : AxisValueOverrider {
+internal fun autoNoConstraints(): CartesianLayerRangeProvider =
+    object : CartesianLayerRangeProvider {
         override fun getMinY(minY: Double, maxY: Double, extraStore: ExtraStore): Double = when {
             minY == 0.0 && maxY == 0.0 -> 0.0
             else -> minY.round(maxY)

features/storage/ui/src/main/kotlin/com/nasdroid/storage/ui/DI.kt

@@ -2,7 +2,7 @@ package com.nasdroid.storage.ui
 
 import com.nasdroid.storage.logic.StorageLogicModule
 import com.nasdroid.storage.ui.pools.overview.PoolsViewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 /**

gradle/libs.versions.toml

@@ -1,21 +1,21 @@
 [versions]
-android-gradle-plugin = "8.6.0"
+android-gradle-plugin = "8.6.1"
 detekt = "1.23.7"
 kotlin = "2.0.20"
 ksp = "2.0.20-1.0.25"
 
 androidx-core = "1.13.1"
-androidx-lifecycle = "2.8.4"
-androidx-navigation = "2.8.0-rc01"
+androidx-lifecycle = "2.8.6"
+androidx-navigation = "2.8.1"
 androidx-window = "1.3.0"
 
-activity-compose = "1.9.1"
-compose-animation = "1.7.0-rc01"
-compose-foundation = "1.7.0-rc01"
-compose-icons = "1.7.0-rc01"
-compose-material3 = "1.3.0-rc01"
-compose-material3-adaptive = "1.0.0-rc01"
-compose-ui = "1.7.0-rc01"
+activity-compose = "1.9.2"
+compose-animation = "1.7.2"
+compose-foundation = "1.7.2"
+compose-icons = "1.7.2"
+compose-material3 = "1.3.0"
+compose-material3-adaptive = "1.0.0"
+compose-ui = "1.7.2"
 accompanist = "0.36.0"
 menuprovider = "1.4.0"
 markdown = "1.1.0"
@@ -34,9 +34,9 @@ kotlinx-coroutines = "1.9.0"
 kotlinx-datetime = "0.6.1"
 kotlinx-serialization-formats = "1.7.2"
 
-koin = "3.5.6"
+koin = "4.0.0"
 
-vico = "2.0.0-alpha.28"
+vico = "2.0.0-beta.1"
 
 turbine = "1.1.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################