From e074ae6a7beaa369034601919dc5225c90e42023 Mon Sep 17 00:00:00 2001 From: jacobrein Date: Thu, 14 Nov 2024 07:29:13 -0700 Subject: [PATCH] - Update: Dependencies, Shared Element API, and Gradle Settings This commit introduces several updates: - **Dependency Updates:** - Upgrades various libraries, including Paging, Navigation Compose, Lifecycle, Activity Compose, DragSelect, Compose BOM, Coil, and Zoomable Image Glide. - Updates the AndroidX version catalog to the latest version (2024.11.00). - **Shared Element API Change:** - Modifies the `sharedElement` function in `SharedElementUtils.kt` to use `sharedContentState` instead of `state`. This aligns with the updated Shared Element API in Compose. - **Gradle Settings Adjustment:** - Comments out the Develocity plugin and associated configurations in `settings.gradle.kts`, potentially streamlining the build process. --- .../utils/sharedelements/SharedElementUtils.kt | 2 +- gradle/libs.versions.toml | 14 +++++++------- settings.gradle.kts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/utils/sharedelements/SharedElementUtils.kt b/UIViews/src/main/java/com/programmersbox/uiviews/utils/sharedelements/SharedElementUtils.kt index 0a23e4b7d..a00d9913a 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/utils/sharedelements/SharedElementUtils.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/utils/sharedelements/SharedElementUtils.kt @@ -53,7 +53,7 @@ fun Modifier.customSharedElement( if (animatedScope != null && key != null && scope != null) { with(scope) { sharedElement( - state = rememberSharedContentState(key = key), + sharedContentState = rememberSharedContentState(key = key), animatedVisibilityScope = animatedScope, /*boundsTransform = boundsTransform, placeHolderSize = placeHolderSize, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dc953692a..a15601971 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kspVersion = "2.0.21-1.0.27" androidxBaselineprofileGradlePlugin = "1.3.3" composeCollapsable = "0.4.0" -dragselect = "2.3.2" +dragselect = "2.4.1" easylauncher = "6.4.0" firebaseCrashlyticsGradle = "3.0.2" googleServices = "4.4.2" @@ -19,14 +19,14 @@ latestAboutLibsRelease = "11.2.3" coroutinesVersion = "1.9.0" glideVersion = "4.16.0" pagecurl = "1.5.1" -pagingVersion = "3.3.2" +pagingVersion = "3.3.4" protobufGradlePlugin = "0.9.4" reorderable = "2.4.0" roomVersion = "2.7.0-alpha11" -navVersion = "2.9.0-alpha02" +navVersion = "2.9.0-alpha03" koinVersion = "4.0.0" coil = "2.7.0" -lifecycle = "2.9.0-alpha06" +lifecycle = "2.9.0-alpha07" jetpack = "1.6.0-alpha03" jetpackCompiler = "1.5.11" jetbrainsCompiler = "1.5.1" @@ -38,12 +38,12 @@ ziplineVersion = "1.1.0" landscapist = "2.4.2" protobufVersion = "4.26.1" sketchVersion = "3.3.2" -activity = "1.10.0-alpha03" +activity = "1.10.0-beta01" composeVersion = "1.8.0-alpha01" compose3Version = "1.3.0" compose3CommonVersion = "1.0.0-alpha01" compose3AdaptiveVersion = "1.1.0-alpha02" -composeBomVersion = "2024.10.01" +composeBomVersion = "2024.11.00" materialKolor = "2.0.0" firebaseKtx = "0.2.1" @@ -60,7 +60,7 @@ uiautomator = "2.3.0" benchmark-macro-junit4 = "1.3.0" androidx-baselineprofile = "1.3.0" profileinstaller = "1.3.1" -zoomableImageGlide = "0.13.0" +zoomableImageGlide = "0.14.0" zoomimageComposeGlide = "1.0.2" googleAndroidLibrariesMapsplatformSecretsGradlePlugin = "2.0.1" diff --git a/settings.gradle.kts b/settings.gradle.kts index d6faa7b47..a87ad472e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,12 +22,12 @@ dependencyResolutionManagement { //TODO: Remove current ones and replace with this! versionCatalogs { create("androidx") { - from("androidx.gradle:gradle-version-catalog:2024.10.01") + from("androidx.gradle:gradle-version-catalog:2024.11.00") } } } -plugins { +/*plugins { id("com.gradle.develocity") version ("3.18.1") } @@ -39,7 +39,7 @@ develocity { publishing { onlyIf { true } } } } -} +}*/ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")