From f258fed943e0eb682f7041665b48dfda0f4de548 Mon Sep 17 00:00:00 2001 From: Fabrizio Scarponi <36624359+fscarponi@users.noreply.github.com> Date: Thu, 23 May 2024 12:35:03 +0200 Subject: [PATCH] 233 - update dependencies (#171) * update dependencies * Remove unnecessary global colors in UI utils The `PackageSearchGlobalColors` function in `UiUtils.kt` has been removed, as it's no longer needed. The color used in `NoModulesFound.kt` has been adjusted from `JewelTheme.globalColors.infoContent` to `JewelTheme.globalColors.text.info`, adhering correctly to the text color scheme. * jewel 233 fix --- buildSrc/build.gradle.kts | 6 ++--- packagesearch.versions.toml | 22 ++++++++++++------- .../packagesearch/plugin/ui/UiUtils.kt | 3 --- .../plugin/ui/bridge/CustomStyles.kt | 20 ----------------- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b0c30127..e76929b0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { implementation(packageSearchCatalog.kotlinter.gradle.plugin) implementation(packageSearchCatalog.shadow.gradle.plugin) implementation(packageSearchCatalog.kotlinx.serialization.json) - implementation("com.squareup:kotlinpoet:1.14.2") - implementation("io.github.pdvrieze.xmlutil:serialization:0.86.2") - implementation("com.vladsch.flexmark:flexmark-all:0.64.8") + implementation(packageSearchCatalog.poet.kotlin) + implementation(packageSearchCatalog.xmlutils.serialization) + implementation(packageSearchCatalog.flexmark) } diff --git a/packagesearch.versions.toml b/packagesearch.versions.toml index ad1517b8..685801ae 100644 --- a/packagesearch.versions.toml +++ b/packagesearch.versions.toml @@ -1,27 +1,30 @@ [versions] -assertk = "0.26.1" +assertk = "0.28.1" caffeine = "3.1.6" commonsCodec = "1.16.0" composeDesktop = "1.6.0-dev1440" -coroutines = "1.7.3" -detekt = "1.23.3" -dokka = "1.9.10" +coroutines = "1.8.0" +detekt = "1.23.6" +dokka = "1.9.20" +flexmark = "0.64.8" foojay = "0.5.0" gradlePublishPlugin = "1.1.0" ideStarter = "233-EAP-SNAPSHOT" idea = "2024.1" ideaGradlePlugin = "1.16.1" -jewel = "0.15.0" -junit = "5.10.0" +jewel = "0.19.0" +junit = "5.10.2" junit4 = "4.13.2" kotlin = "1.9.20" +kotlinPoet = "1.15.2" kotlinterGradlePlugin = "3.12.0" -kotlinxDatetime = "0.4.1" -kotlinxSerialization = "1.6.0" +kotlinxDatetime = "0.5.0" +kotlinxSerialization = "1.6.3" ktor = "2.3.5" logback = "1.4.11" nitrite = "4.2.2" packagesearchApiModels = "3.1.0" +xmlutilsSerialization = "0.86.2" [libraries] assertk = { module = "com.willowtreeapps.assertk:assertk-jvm", version.ref = "assertk" } @@ -35,6 +38,7 @@ compose-desktop-jvm-macos-x64 = { module = "org.jetbrains.compose.desktop:deskto compose-desktop-jvm-windows-x64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-windows-x64", version.ref = "composeDesktop" } detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } +flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } foojay-resolver-gradle-plugin = { module = "org.gradle.toolchains:foojay-resolver", version.ref = "foojay" } gradle-intellij-platform-plugin = { module = "org.jetbrains.intellij.plugins:gradle-intellij-plugin", version.ref = "ideaGradlePlugin" } ide-starter-junit5 = { module = "com.jetbrains.intellij.tools:ide-starter-junit5", version.ref = "ideStarter" } @@ -79,7 +83,9 @@ packagesearch-api-client = { module = "org.jetbrains.packagesearch:packagesearch packagesearch-api-models = { module = "org.jetbrains.packagesearch:packagesearch-api-models", version.ref = "packagesearchApiModels" } packagesearch-build-systems-models = { module = "org.jetbrains.packagesearch:packagesearch-build-systems-models", version.ref = "packagesearchApiModels" } packagesearch-http-models = { module = "org.jetbrains.packagesearch:packagesearch-http-models", version.ref = "packagesearchApiModels" } +poet-kotlin = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" } potassium-nitrite = { module = "org.dizitart:potassium-nitrite", version.ref = "nitrite" } +xmlutils-serialization = { module = "io.github.pdvrieze.xmlutil:serialization", version.ref = "xmlutilsSerialization" } # Plugin libraries for build-logic's convention plugins to use to resolve the types/tasks coming from these plugins diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/UiUtils.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/UiUtils.kt index 724cc5a3..4f8a50ea 100644 --- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/UiUtils.kt +++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/UiUtils.kt @@ -5,10 +5,8 @@ import androidx.compose.runtime.CompositionLocalProvider import com.intellij.openapi.project.Project import com.jetbrains.packagesearch.plugin.ui.bridge.LocalPackageSearchDropdownLinkStyle import com.jetbrains.packagesearch.plugin.ui.bridge.PackageSearchDropdownLinkStyle -import com.jetbrains.packagesearch.plugin.ui.bridge.PackageSearchGlobalColors import com.jetbrains.packagesearch.plugin.ui.bridge.PackageSearchTabStyle import com.jetbrains.packagesearch.plugin.ui.bridge.PackageSearchTreeStyle -import org.jetbrains.jewel.foundation.LocalGlobalColors import org.jetbrains.jewel.ui.component.styling.LocalDefaultTabStyle import org.jetbrains.jewel.ui.component.styling.LocalLazyTreeStyle @@ -16,7 +14,6 @@ import org.jetbrains.jewel.ui.component.styling.LocalLazyTreeStyle internal fun PackageSearchTheme(project: Project, content: @Composable () -> Unit) { CompositionLocalProvider( LocalComponentManager provides project, - LocalGlobalColors provides PackageSearchGlobalColors(), LocalDefaultTabStyle provides PackageSearchTabStyle(), LocalLazyTreeStyle provides PackageSearchTreeStyle(), LocalPackageSearchDropdownLinkStyle provides PackageSearchDropdownLinkStyle(), diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/CustomStyles.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/CustomStyles.kt index 9da50826..f52ec028 100644 --- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/CustomStyles.kt +++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/CustomStyles.kt @@ -63,26 +63,6 @@ internal fun PackageSearchTabStyle(): TabStyle { ) } -@Composable -fun PackageSearchGlobalColors(): GlobalColors { - val colors = LocalGlobalColors.current - - return remember(colors) { - GlobalColors( - borders = colors.borders, - outlines = OutlineColors( - focused = Color.Transparent, - focusedWarning = colors.outlines.focusedWarning, - focusedError = colors.outlines.focusedError, - warning = colors.outlines.warning, - error = colors.outlines.error, - ), - infoContent = colors.infoContent, - paneBackground = colors.paneBackground, - ) - } -} - @Composable internal fun PackageSearchTreeStyle(): LazyTreeStyle { val currentStyle = LocalLazyTreeStyle.current