From 325d4c6c3c23e6bafd7be96d2064a100567d10e6 Mon Sep 17 00:00:00 2001 From: Patrick Michalik <120058021+patrickmichalik@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:01:17 +0200 Subject: [PATCH] Update dependencies --- .idea/kotlinc.xml | 2 +- gradle/libs.versions.toml | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 18 +++++++++++++++++- sample/build.gradle | 2 +- .../vico/sample/showcase/ChartScreen.kt | 2 +- versions.gradle | 3 +-- vico/compose-m2/build.gradle | 2 +- vico/compose-m3/build.gradle | 2 +- vico/compose/build.gradle | 2 +- 9 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 521b0bd95..9b53bedf3 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93d1dab18..f6097ed59 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] -accompanist = "0.34.0" -activity = "1.9.1" -agp = "8.5.1" -androidXAnnotation = "1.8.1" +accompanist = "0.36.0" +activity = "1.9.2" +agp = "8.6.1" +androidXAnnotation = "1.8.2" androidXCore = "1.13.1" appcompat = "1.7.0" -composeBom = "2024.06.00" -composeNavigation = "2.7.7" +composeBom = "2024.09.01" +composeNavigation = "2.8.0" composeStableMarker = "1.0.5" -coroutines = "1.8.1" +coroutines = "1.9.0" dokka = "1.9.20" jUnit = "4.13.2" jUnitExt = "1.1.5" jupiter = "5.10.3" -kotlin = "2.0.10" -lifecycle = "2.8.4" +kotlin = "2.0.20" +lifecycle = "2.8.5" material = "1.12.0" mockK = "1.13.12" paparazziGradlePlugin = "1.3.4" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e5..697ad6888 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,22 @@ +# +# Copyright 2024 by Patryk Goworowski and Patrick Michalik. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sample/build.gradle b/sample/build.gradle index d8537c2da..b439e8c80 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -23,7 +23,7 @@ plugins { android { defaultConfig { - minSdk library.compose_min_sdk + minSdk library.min_sdk targetSdk library.target_sdk compileSdk library.target_sdk versionCode library.version_code diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartScreen.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartScreen.kt index 286dff30f..539406085 100644 --- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartScreen.kt +++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartScreen.kt @@ -37,10 +37,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.navigation.NavController import androidx.navigation.NavType import androidx.navigation.compose.NavHost diff --git a/versions.gradle b/versions.gradle index 77dec5b91..ca8810033 100644 --- a/versions.gradle +++ b/versions.gradle @@ -21,7 +21,6 @@ ext { version_name : "2.0.0-beta.1", version_code : 1, target_sdk : 34, - min_sdk : 19, - compose_min_sdk: 21, + min_sdk : 21, ] } diff --git a/vico/compose-m2/build.gradle b/vico/compose-m2/build.gradle index 7fda3e724..3fe8b6b9e 100644 --- a/vico/compose-m2/build.gradle +++ b/vico/compose-m2/build.gradle @@ -26,7 +26,7 @@ apply from: "$rootDir/common-scripts.gradle" android { defaultConfig { - minSdk library.compose_min_sdk + minSdk library.min_sdk } buildFeatures { diff --git a/vico/compose-m3/build.gradle b/vico/compose-m3/build.gradle index bfeb96fff..d95302bca 100644 --- a/vico/compose-m3/build.gradle +++ b/vico/compose-m3/build.gradle @@ -26,7 +26,7 @@ apply from: "$rootDir/common-scripts.gradle" android { defaultConfig { - minSdk library.compose_min_sdk + minSdk library.min_sdk } buildFeatures { diff --git a/vico/compose/build.gradle b/vico/compose/build.gradle index 5d33619d1..67ed5deca 100644 --- a/vico/compose/build.gradle +++ b/vico/compose/build.gradle @@ -26,7 +26,7 @@ apply from: "$rootDir/common-scripts.gradle" android { defaultConfig { - minSdk library.compose_min_sdk + minSdk library.min_sdk } buildFeatures {