From 71533ac863fba80156005faeb46244077ce8d9a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 05:53:41 +0000 Subject: [PATCH 1/2] Bump the versions group across 1 directory with 18 updates Bumps the versions group with 18 updates in the / directory: | Package | From | To | | --- | --- | --- | | [io.ktor:ktor-client-logging-jvm](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | androidx.compose:compose-bom | `2024.09.02` | `2024.09.03` | | com.google.firebase:firebase-bom | `33.3.0` | `33.4.0` | | [io.ktor:ktor-client-core](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-cio](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-darwin](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-serialization](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-content-negotiation](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-json](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-serialization-kotlinx-json](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [io.ktor:ktor-client-logging](https://github.com/ktorio/ktor) | `2.3.12` | `3.0.0` | | [org.jetbrains.kotlin.plugin.serialization](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | [org.jetbrains.kotlin.multiplatform](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | [org.jetbrains.kotlin.plugin.compose](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | org.jetbrains.compose | `1.6.11` | `1.7.0+build1877-release-1.7` | | com.android.application | `8.6.1` | `8.7.0` | | com.android.library | `8.6.1` | `8.7.0` | Updates `io.ktor:ktor-client-logging-jvm` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `androidx.compose:compose-bom` from 2024.09.02 to 2024.09.03 Updates `com.google.firebase:firebase-bom` from 33.3.0 to 33.4.0 Updates `io.ktor:ktor-client-core` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-cio` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-darwin` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-serialization` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-content-negotiation` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-json` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-serialization-kotlinx-json` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-logging` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-cio` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-darwin` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-serialization` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-content-negotiation` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-json` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-serialization-kotlinx-json` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `io.ktor:ktor-client-logging` from 2.3.12 to 3.0.0 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.12...3.0.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin.android` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin.multiplatform` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin.plugin.compose` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin.android` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin.multiplatform` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.compose` from 1.6.11 to 1.7.0+build1877-release-1.7 Updates `org.jetbrains.kotlin.plugin.compose` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `com.android.application` from 8.6.1 to 8.7.0 Updates `com.android.library` from 8.6.1 to 8.7.0 Updates `com.android.library` from 8.6.1 to 8.7.0 --- updated-dependencies: - dependency-name: io.ktor:ktor-client-logging-jvm dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: androidx.compose:compose-bom dependency-type: direct:production dependency-group: versions - dependency-name: com.google.firebase:firebase-bom dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: io.ktor:ktor-client-core dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-cio dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-darwin dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-serialization dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-content-negotiation dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-json dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-serialization-kotlinx-json dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-logging dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-cio dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-darwin dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-serialization dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-content-negotiation dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-json dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-serialization-kotlinx-json dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: io.ktor:ktor-client-logging dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.android.application dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: com.android.library dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: com.android.library dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 12 ++++++------ modules/features/root/impl/build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7f4ccef..96e2318 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] # Kotlin -kotlin-version = "2.0.20" # https://github.com/JetBrains/kotlin +kotlin-version = "2.0.21" # https://github.com/JetBrains/kotlin kotlin-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines -kotlin-android-application = "8.6.1" # https://developer.android.com/build/releases/gradle-plugin +kotlin-android-application = "8.7.0" # https://developer.android.com/build/releases/gradle-plugin kotlin-serialization-json = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization # Androidx androidx-material = "1.12.0" # https://github.com/material-components/material-components-android -androidx-compose-bom = "2024.09.02" # https://developer.android.com/jetpack/androidx/releases/compose#versions +androidx-compose-bom = "2024.09.03" # https://developer.android.com/jetpack/androidx/releases/compose#versions androidx-room = "2.6.1" # https://developer.android.com/jetpack/androidx/releases/room androidx-activity-compose = "1.9.2" # https://developer.android.com/jetpack/androidx/releases/activity leakcanary = "2.14" # https://github.com/square/leakcanary @@ -19,14 +19,14 @@ google-auth = "21.2.0" # https://developers.google.com/android/guides/setup google-crashlytics = "3.0.2" # https://firebase.google.com/docs/crashlytics/get-started google-services = "4.4.2" # https://developers.google.com/android/guides/google-services-plugin google-accompanist = "0.36.0" # https://github.com/google/accompanist -google-firebase-bom = "33.3.0" # https://firebase.google.com/support/release-notes/android +google-firebase-bom = "33.4.0" # https://firebase.google.com/support/release-notes/android # Testw tests-assertk = "0.28.1" # https://github.com/willowtreeapps/assertk tests-turbine = "1.1.0" # https://github.com/cashapp/turbine # Other -ktor = "2.3.12" # https://github.com/ktorio/ktor +ktor = "3.0.0" # https://github.com/ktorio/ktor # klibs klibs-mikro = "1.8.8" # https://github.com/makeevrserg/klibs.mikro @@ -34,7 +34,7 @@ klibs-kstorage = "3.1.3" # https://github.com/makeevrserg/klibs.kstorage klibs-kdi = "1.4.8" # https://github.com/makeevrserg/KDI # Compose -kotlin-compose = "1.6.11" # https://github.com/JetBrains/compose-multiplatform +kotlin-compose = "1.7.0+build1877-release-1.7" # https://github.com/JetBrains/compose-multiplatform # Moko moko-mvvm = "0.16.1" # https://github.com/icerockdev/moko-mvvm diff --git a/modules/features/root/impl/build.gradle.kts b/modules/features/root/impl/build.gradle.kts index 8885e9c..fc7bd8e 100644 --- a/modules/features/root/impl/build.gradle.kts +++ b/modules/features/root/impl/build.gradle.kts @@ -74,5 +74,5 @@ dependencies { implementation(libs.klibs.kstorage) implementation(libs.google.auth) implementation(libs.kotlin.coroutines.playServices) - implementation("io.ktor:ktor-client-logging-jvm:2.3.12") + implementation("io.ktor:ktor-client-logging-jvm:3.0.0") } From d6caf99d117a8ba1c4b2d70bbdb87158818cb5cd Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Sun, 20 Oct 2024 13:37:48 +0300 Subject: [PATCH 2/2] fix build --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../core/ui/components/bottomsheet/SlotModalBottomSheet.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3783d1a..44ef032 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,8 +38,8 @@ makeevrserg.android.sdk.target=34 # Project makeevrserg.project.name=ApplicationTemplate makeevrserg.project.group=com.makeevrserg.applicationtemplate -makeevrserg.project.version.string=1.2.13 -makeevrserg.project.version.code=25 +makeevrserg.project.version.string=1.2.14 +makeevrserg.project.version.code=26 makeevrserg.project.description=Template for KMP applcation makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com makeevrserg.project.url=https://github.com/makeevrserg/KMP-Template diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index efe3301..c0f876e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Feb 05 12:09:22 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/modules/services/core-ui/src/commonMain/kotlin/com/makeevrserg/applicationtemplate/mobile/core/ui/components/bottomsheet/SlotModalBottomSheet.kt b/modules/services/core-ui/src/commonMain/kotlin/com/makeevrserg/applicationtemplate/mobile/core/ui/components/bottomsheet/SlotModalBottomSheet.kt index 3ed5e45..27dd366 100644 --- a/modules/services/core-ui/src/commonMain/kotlin/com/makeevrserg/applicationtemplate/mobile/core/ui/components/bottomsheet/SlotModalBottomSheet.kt +++ b/modules/services/core-ui/src/commonMain/kotlin/com/makeevrserg/applicationtemplate/mobile/core/ui/components/bottomsheet/SlotModalBottomSheet.kt @@ -44,7 +44,7 @@ fun SlotModalBottomSheet( ModalBottomSheet( onDismissRequest = { onDismiss.invoke() }, sheetState = sheetState, - windowInsets = WindowInsets.zero, + contentWindowInsets = { WindowInsets.zero }, content = { content.invoke(this, child) }