Skip to content

Commit

Permalink
Merge pull request #54 from makeevrserg/dependabot/gradle/versions-85…
Browse files Browse the repository at this point in the history
…c289da21

build(deps): bump the versions group with 29 updates
  • Loading branch information
makeevrserg authored Dec 7, 2024
2 parents aadd26c + 2bf08f4 commit b8705e3
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 24 deletions.
10 changes: 9 additions & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ updates:
versions:
dependency-type: production
applies-to: version-updates
update-types:
- major
- minor
- patch
open-pull-requests-limit: 1

- package-ecosystem: "github-actions"
Expand All @@ -25,5 +29,9 @@ updates:
versions:
dependency-type: production
applies-to: version-updates
update-types:
- major
- minor
- patch
rebase-strategy: "disabled"
open-pull-requests-limit: 1
open-pull-requests-limit: 1
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ makeevrserg.java.source=11
makeevrserg.java.target=17
makeevrserg.java.ktarget=17
# Android
makeevrserg.android.sdk.compile=34
makeevrserg.android.sdk.compile=35
makeevrserg.android.sdk.min=23
makeevrserg.android.sdk.target=34
makeevrserg.android.sdk.target=35
# Project
makeevrserg.project.name=EmpireProjektMobile
makeevrserg.project.group=com.makeevrserg.empireprojekt.mobile
makeevrserg.project.version.string=0.7.6
makeevrserg.project.version.code=30
makeevrserg.project.version.string=0.7.7
makeevrserg.project.version.code=31
makeevrserg.project.description=EmpireProjekt mobile application
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://empireprojekt.ru
Expand Down
36 changes: 19 additions & 17 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
# Kotlin
kotlin-version = "2.0.21"
kotlin-version = "2.1.0"
kotlin-coroutines = "1.9.0"
kotlin-android-application = "8.7.1"
kotlin-android-application = "8.7.3"
kotlin-serialization-json = "1.7.3"

# Androidx
androidx-compose-bom = "2024.10.00"
androidx-compose-bom = "2024.11.00"
androidx-activity-compose = "1.9.3"
android-work = "2.9.1"
android-work = "2.10.0"
leakcanary = "2.14"
horologist = "0.6.12"
compose-wear = "1.4.0"
Expand All @@ -19,54 +19,56 @@ google-auth = "21.2.0"
google-crashlytics = "3.0.2"
google-services = "4.4.2"
google-accompanist = "0.36.1-SNAPSHOT"
google-firebase-bom = "33.4.0"
google-firebase-bom = "33.7.0"

# Testw
tests-assertk = "0.28.1"
tests-turbine = "1.2.0"

# Other
ktor = "3.0.0"
ktor = "3.0.1"

# klibs
klibs-mikro = "1.8.8"
klibs-kstorage = "3.1.3"
klibs-kstorage = "3.2.0"
klibs-kdi = "1.4.8"
klibs-gradleplugin = "1.4.0"
klibs-paging = "2.2.4"

# Compose
kotlin-compose = "1.7.0+"
kotlin-compose = "1.7.1"

# Moko
moko-resources = "0.23.0"
moko-resources = "0.24.3"

# Decompose
decompose = "3.1.0" # https://github.com/arkivanov/Decompose/releases
essenty = "2.1.0"
decompose = "3.2.2" # https://github.com/arkivanov/Decompose/releases
essenty = "2.3.0"

# MVIKotlin
mvikotlin = "4.2.0"

# Settings
mppsettings = "1.2.0"
mppsettings = "1.3.0"

# wear
wear-glance-tiles = "1.0.0-alpha05"
wear-tiles = "1.4.1"
wear-complications = "1.2.1"

[libraries]
# wear
wear-glance-tiles = { module = "androidx.glance:glance-wear-tiles", version.ref = "wear-glance-tiles" }
wear-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "wear-tiles" }
wear-tiles-material = { module = "androidx.wear.tiles:tiles-material", version.ref = "wear-tiles" }
wear-complications-datasource-ktx = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version.strictly = "1.2.1" }
wear-complications-datasource-ktx = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version.ref = "wear-complications" }
# klibs
klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
klibs-mikro-platform = { module = "ru.astrainteractive.klibs:mikro-platform", version.ref = "klibs-mikro" }
klibs-mikro-extensions = { module = "ru.astrainteractive.klibs:mikro-extensions", version.ref = "klibs-mikro" }
klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.ref = "klibs-kdi" }
klibs-paging = { module = "ru.astrainteractive.klibs:paging", version.strictly = "2.2.1" }
klibs-paging = { module = "ru.astrainteractive.klibs:paging", version.ref = "klibs-paging" }

# Settings
mppsettings = { module = "com.russhwolf:multiplatform-settings", version.ref = "mppsettings" }
Expand All @@ -92,7 +94,7 @@ kotlin-coroutines-playServices = { module = "org.jetbrains.kotlinx:kotlinx-corou
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }

# Androidx
androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.strictly = "2.8.1" }
androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.strictly = "2.8.7" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "android-work" }
Expand All @@ -104,7 +106,7 @@ google-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref
google-firebase-crsahlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx" }
google-firebase-crsahlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "google-crashlytics" }
google-gms-services-gradle = { module = "com.google.gms:google-services", version.ref = "google-services" }
google-gms-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.strictly = "18.2.0" }
google-gms-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.strictly = "19.0.0" }
google-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "google-auth" }
google-accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "google-accompanist" }
google-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "google-accompanist" }
Expand Down Expand Up @@ -149,7 +151,7 @@ android-library = { id = "com.android.application", version.ref = "kotlin-androi
android-application = { id = "com.android.library", version.ref = "kotlin-android-application" }

# Gradle
gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.strictly = "5.3.5" }
gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.strictly = "5.5.1" }

# moko
moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko-resources" }
Expand Down
2 changes: 1 addition & 1 deletion modules/features/root/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ dependencies {
implementation(libs.klibs.kstorage)
implementation(libs.google.auth)
implementation(libs.kotlin.coroutines.playServices)
implementation("io.ktor:ktor-client-logging-jvm:3.0.0")
implementation("io.ktor:ktor-client-logging-jvm:3.0.1")
}
2 changes: 1 addition & 1 deletion modules/services/core-resources/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kotlin {
}

multiplatformResources {
multiplatformResourcesPackage = "${requireProjectInfo.group}.core.resources"
resourcesPackage.set("${requireProjectInfo.group}.core.resources")
}

android {
Expand Down

0 comments on commit b8705e3

Please sign in to comment.