chore: Compose, Gradle and Kotlin version increment.

.github/scripts/changed-modules.sh

@@ -41,7 +41,7 @@ while IFS= read -r FILE; do
         TESTING_SEEN_COMPOSE=true
       fi
     fi
-    if [[ "$FIRST" != "icons" && "$FIRST" != "testing" ]]; then
+    if [[ "$FIRST" != "icons" && "$FIRST" != "testing" && "$FIRST" != "gradle" ]]; then
       MODULE=":sdds-core:$FIRST"
       MODULES_SET+=("$MODULE")
       echo "✅ Matched: $MODULE"

build-system/conventions/build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
     implementation("org.commonmark:commonmark:0.21.0")
 
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(files(icons.javaClass.superclass.protectionDomain.codeSource.location))
     testImplementation(libs.base.test.unit.jUnit)
     testImplementation(libs.base.test.unit.mockk)
 }

build-system/conventions/src/main/kotlin/convention.compose.gradle.kts

@@ -6,10 +6,10 @@ import utils.withVersionCatalogs
 val extension = app() ?: lib() ?: throwApplyException()
 extension.configureCompose()
 
-fun app(): CommonExtension<*, *, *, *, *>? =
+fun app(): CommonExtension<*, *, *, *, *, *>? =
     extensions.findByType<ApplicationExtension>()
 
-fun lib(): CommonExtension<*, *, *, *, *>? =
+fun lib(): CommonExtension<*, *, *, *, *, *>? =
     extensions.findByType<LibraryExtension>()
 
 fun throwApplyException(): Nothing =
@@ -18,7 +18,7 @@ fun throwApplyException(): Nothing =
             "The plugin can be applied for android application or android library."
     )
 
-fun CommonExtension<*, *, *, *, *>.configureCompose() = withVersionCatalogs {
+fun CommonExtension<*, *, *, *, *, *>.configureCompose() = withVersionCatalogs {
     buildFeatures.compose = true
     composeOptions.kotlinCompilerExtensionVersion = versions.androidX.compose.compiler.get()
 

build-system/conventions/src/main/kotlin/convention.core-dependencies.gradle.kts

@@ -12,7 +12,6 @@ subprojects {
                 @Suppress("LABEL_NAME_CLASH")
                 return@all
             }
-            println("requested module ${moduleSelector.module}")
             when (moduleSelector.module) {
                 "sdds-uikit-compose" -> useTarget(
                     "sdds-core:uikit-compose:*",

build-system/conventions/src/main/kotlin/convention.documentation.gradle.kts

@@ -67,7 +67,13 @@ val docsSnippets by configurations.creating {
     }
 }
 
+afterEvaluate {
+    ksp {
+        arg("packageName", project.extensions.getByType(LibraryExtension::class.java).namespace.orEmpty())
+    }
+}
+
 dependencies {
     "implementation"("sdds-core:docs")
-    "ksp"(":sdds-core:docs-ksp")
+    ksp("sdds-core:docs-ksp")
 }

build-system/conventions/src/main/kotlin/tasks/BuildTokenChangelogTask.kt

@@ -4,7 +4,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.TaskAction
 import org.jetbrains.kotlin.com.google.gson.GsonBuilder
 import org.jetbrains.kotlin.com.google.gson.JsonObject
@@ -28,7 +28,7 @@ abstract class BuildTokenChangelogTask : DefaultTask() {
     @get:Input
     abstract val libraryChangelogJsonPath: Property<String>
 
-    @get:OutputFile
+    @get:InputFile
     abstract val outputChangelogMdFile: RegularFileProperty
 
     @TaskAction

build-system/conventions/src/main/kotlin/utils/BuildUtils.kt

@@ -2,6 +2,7 @@ package utils
 
 import com.android.build.gradle.LibraryExtension
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.accessors.dm.LibrariesForIcons
 import java.io.File
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.findByType
@@ -42,6 +43,14 @@ fun Project.getVersionCatalog(): LibrariesForLibs? {
     } else null
 }
 
+/**
+ * Возвращает делегат для доступа к каталогу версий
+ */
+fun Project.iconsCatalog(): LibrariesForIcons? =
+    if (name != "gradle-kotlin-dsl-accessors")
+        the<LibrariesForIcons>()
+    else null
+
 /**
  * Производит поиск свойства [propertyName] во всех файла gradle.properties,
  * если не находит - возвращает [default]

build-system/conventions/src/main/kotlin/utils/DocsProjectUtils.kt

@@ -52,7 +52,7 @@ val Project.docsUikitComposeVersion: String
  * Возвращает "latest", если версия не указана.
  */
 val Project.docsIconsVersion: String
-    get() = getVersionCatalog()?.versions?.sdds?.icons?.get() ?: "latest"
+    get() = iconsCatalog()?.versions?.sdds?.icons?.get() ?: "latest"
 
 /**
  * Возвращает URL на API-документацию артефакта в зависимости от типа библиотеки (Compose или XML).

build-system/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Feb 22 10:32:29 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build-system/settings.gradle.kts

@@ -10,10 +10,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
-            // Костыль. Версия иконок лежит в отдельном toml файле, чтобы избежать конфликтов из-за
-            // раздельных релизных процессов иконок и остальных библиотек
-            org.gradle.api.internal.catalog.parser.TomlCatalogFileParser
-                .parse(file("../gradle/icons.version.toml").toPath(), this)
+        }
+        create("icons") {
+            from(files("../gradle/icons.version.toml"))
         }
     }
 }

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-global-gradle = "8.1.4"
+global-gradle = "8.3.2"
 global-jvmTarget = "1.8"
-global-kotlin = "1.8.22"
-global-compileSdk = "34"
-global-targetSdk = "34"
+global-kotlin = "1.9.25"
+global-compileSdk = "35"
+global-targetSdk = "35"
 global-minSdk = "24"
 
 staticAnalysis-detekt = "1.22.0"
@@ -14,9 +14,9 @@ staticAnalysis-spotless = "6.20.0"
 android-material = "1.3.0"
 androidX-core = "1.7.0"
 androidX-appcompat = "1.3.1"
-androidX-compose-compiler = "1.4.8"
+androidX-compose-compiler = "1.5.15"
 androidX-activity-compose = "1.3.1"
-androidX-compose-bom = "2024.09.00"
+androidX-compose-bom = "2025.05.00"
 androidX-lifecycle-compose = "2.4.1"
 androidX-navigation="2.7.2"
 androidX-constraintLayout = "2.1.4"
@@ -34,7 +34,7 @@ test-androidX-runner = "1.5.2"
 test-roborazzi = "1.44.0"
 
 kotlinSerialization = "1.4.0"
-kotlinKsp = "1.8.22-1.0.11"
+kotlinKsp = "1.9.25-1.0.20"
 kotlinPoet = "1.12.0"
 glide = "4.16.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Feb 07 16:56:30 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

playground/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Mar 04 17:09:42 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

playground/sandbox-compose/build.gradle.kts

@@ -126,7 +126,7 @@ tasks.register("generateVersionDescription") {
 }
 
 dependencies {
-    implementation(libs.sdds.icons)
+    implementation(icons.sdds.icons)
     implementation("tokens:sdds.serv.view")
     implementation("tokens:sdds.serv.compose")
     implementation(project(":sandbox-sdds-serv-integration"))
@@ -197,3 +197,7 @@ dependencies {
     testImplementation(libs.test.roborazzi.rule)
     testImplementation(libs.base.test.unit.robolectric)
 }
+
+tasks.matching { it.name.matches(Regex("generate\\w+Resources")) }.configureEach {
+    dependsOn(tasks.withType<GenerateStarDimensTask>())
+}

playground/sandbox-compose/src/main/kotlin/com/sdds/playground/sandbox/buttons/vs/BasicButtonViewModel.kt

@@ -121,6 +121,10 @@ internal class BasicButtonViewModel(
                 name = PropertyName.Loading.value,
                 value = loading,
             ),
+            Property.BooleanProperty(
+                name = PropertyName.FixedSize.value,
+                value = fixedSize,
+            ),
         )
     }
 

playground/sandbox-compose/src/main/kotlin/com/sdds/playground/sandbox/core/compose/bottomsheet/BottomSheetScaffold.kt

@@ -141,7 +141,7 @@ private fun consumeSwipeWithinBottomSheetBoundsNestedScrollConnection(
     override suspend fun onPreFling(available: Velocity): Velocity {
         val toFling = available.velocityToFloat()
         val currentOffset = state.requireOffset()
-        return if (toFling < 0 && currentOffset > state.anchors.minAnchor()) {
+        return if (toFling < 0 && currentOffset > state.anchors.minPosition()) {
             state.settle(toFling)
             available
         } else {

playground/sandbox-compose/src/main/kotlin/com/sdds/playground/sandbox/core/compose/bottomsheet/BottomSheetState.kt

@@ -134,7 +134,7 @@ internal class BottomSheetState(
         get() = currentValue == BottomSheetValue.Collapsed
 
     private val hasHalfExpandedState: Boolean
-        get() = draggableState.anchors.hasAnchorFor(BottomSheetValue.HalfExpanded)
+        get() = draggableState.anchors.hasPositionFor(BottomSheetValue.HalfExpanded)
 
     /**
      * Show the bottom sheet with animation and suspend until it's shown.
@@ -153,7 +153,7 @@ internal class BottomSheetState(
      * Expand the bottom sheet with an animation and suspend until the animation finishes or is cancelled.
      */
     suspend fun expand() {
-        if (draggableState.anchors.hasAnchorFor(BottomSheetValue.Expanded)) {
+        if (draggableState.anchors.hasPositionFor(BottomSheetValue.Expanded)) {
             animateTo(BottomSheetValue.Expanded)
         }
     }
@@ -162,7 +162,7 @@ internal class BottomSheetState(
      * Half expand the bottom sheet with an animation and suspend until the animation finishes or is cancelled.
      */
     suspend fun halfExpand() {
-        if (draggableState.anchors.hasAnchorFor(BottomSheetValue.HalfExpanded)) {
+        if (draggableState.anchors.hasPositionFor(BottomSheetValue.HalfExpanded)) {
             animateTo(BottomSheetValue.HalfExpanded)
         }
     }
@@ -182,7 +182,7 @@ internal class BottomSheetState(
         val peekHeightF = peekHeight.toFloat().coerceAtMost(layoutHeightF)
         val newAnchors = DraggableAnchors {
             BottomSheetValue
-                .values()
+                .entries
                 .forEach { anchor ->
                     when (anchor) {
                         BottomSheetValue.Collapsed -> anchor at (layoutHeightF - peekHeightF).coerceAtLeast(0f)

playground/settings.gradle.kts

@@ -11,10 +11,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
-            // Костыль. Версия иконок лежит в отдельном toml файле, чтобы избежать конфликтов из-за
-            // раздельных релизных процессов иконок и остальных библиотек
-            org.gradle.api.internal.catalog.parser.TomlCatalogFileParser
-                .parse(file("../gradle/icons.version.toml").toPath(), this)
+        }
+        create("icons") {
+            from(files("../gradle/icons.version.toml"))
         }
     }
 }

sdds-core/docs-ksp/build.gradle.kts

@@ -2,6 +2,8 @@ plugins {
     id("convention.kotlin-lib")
 }
 
+group = "sdds-core"
+
 dependencies {
     implementation(libs.base.kotlin.ksp)
 }

sdds-core/docs-ksp/src/main/kotlin/com/sdds/docs/ksp/DocSamplesProcessor.kt

@@ -18,7 +18,7 @@ import java.io.OutputStreamWriter
  */
 class DocSamplesProcessorProvider : SymbolProcessorProvider {
     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor =
-        DocSamplesProcessor(environment.codeGenerator, environment.logger)
+        DocSamplesProcessor(environment.codeGenerator, environment.logger, environment.options)
 }
 
 /**
@@ -32,12 +32,14 @@ class DocSamplesProcessorProvider : SymbolProcessorProvider {
 class DocSamplesProcessor(
     private val codeGenerator: CodeGenerator,
     private val logger: KSPLogger,
+    options: Map<String, String>,
 ) : SymbolProcessor {
 
     private val docSampleAnn = "com.sdds.docs.DocSample"
     private val contextType = "android.content.Context"
     private val viewType = "android.view.View"
     private val composableAnn = "androidx.compose.runtime.Composable"
+    private val packageName: String = options["packageName"] ?: "com.sdds.docs"
 
     private val kotlinEntries: LinkedHashMap<String, Entry> = linkedMapOf()
     private val viewEntries: LinkedHashMap<String, Entry> = linkedMapOf()
@@ -174,7 +176,7 @@ class DocSamplesProcessor(
         view: List<Entry>,
         composable: List<Entry>,
     ) {
-        val pkg = "com.sdds.docs"
+        val pkg = packageName
         val fileName = "DocSampleRegistry"
 
         if (regular.isEmpty() && composable.isEmpty() && view.isEmpty()) return

sdds-core/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Feb 22 11:08:38 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sdds-core/settings.gradle.kts

@@ -11,10 +11,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
-            // Костыль. Версия иконок лежит в отдельном toml файле, чтобы избежать конфликтов из-за
-            // раздельных релизных процессов иконок и остальных библиотек
-            org.gradle.api.internal.catalog.parser.TomlCatalogFileParser
-                .parse(file("../gradle/icons.version.toml").toPath(), this)
+        }
+        create("icons") {
+            from(files("../gradle/icons.version.toml"))
         }
     }
 }

sdds-core/uikit-compose/src/main/kotlin/com/sdds/compose/uikit/Popover.kt

@@ -168,7 +168,7 @@ enum class PopoverPlacementMode {
 fun Modifier.popoverTrigger(triggerInfo: MutableState<TriggerInfo>): Modifier {
     return composed {
         val currentScaleFactor = LocalFocusSelectorSettings.current.scale.scaleFactor
-        this then layout { measurable, constraints ->
+        layout { measurable, constraints ->
             val placeable = measurable.measure(constraints)
             triggerInfo.value = triggerInfo.value.copy(
                 topAlignmentLine = placeable[topAlignmentLine],
@@ -179,12 +179,12 @@ fun Modifier.popoverTrigger(triggerInfo: MutableState<TriggerInfo>): Modifier {
             return@layout layout(placeable.width, placeable.height) {
                 placeable.placeRelative(IntOffset.Zero)
             }
-        } then onGloballyPositioned {
+        }.onGloballyPositioned {
             triggerInfo.value = triggerInfo.value.copy(
                 size = it.size,
                 positionInRoot = it.positionInWindow().round(),
             )
-        } then onFocusChanged {
+        }.onFocusChanged {
             val scaleFactor = if (it.isFocused) {
                 currentScaleFactor
             } else {

sdds-core/uikit-compose/src/main/kotlin/com/sdds/compose/uikit/internal/drawer/DrawerContent.kt

@@ -310,13 +310,13 @@ private fun DrawerState.updateAnchorsFor(size: IntSize, peekOffset: Float) {
     }
 
     val hasAnchors = anchoredDraggableState.anchors.size > 0
-    val newTarget = if (!hasAnchors && anchors.hasAnchorFor(currentValue)) {
+    val newTarget = if (!hasAnchors && anchors.hasPositionFor(currentValue)) {
         currentValue
     } else {
         when (targetValue) {
             DrawerValue.Closed -> DrawerValue.Closed
             DrawerValue.Opened -> {
-                val newTarget = if (anchors.hasAnchorFor(DrawerValue.Opened)) {
+                val newTarget = if (anchors.hasPositionFor(DrawerValue.Opened)) {
                     DrawerValue.Opened
                 } else {
                     DrawerValue.Closed