Skip to content

Commit cb2c5f1

Browse files
committed
Merge branch 'main' into feature/change-project
# Conflicts: # gradle/libs.versions.toml
2 parents e906fb5 + 6540155 commit cb2c5f1

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

gradle/libs.versions.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
gradle = "7.5.1"
33
mkdocs = "2.4.0"
44
androidGradlePlugin = "7.3.1"
5-
accompanist = "0.25.1"
5+
accompanist = "0.27.0"
66
androidx-compose-compiler = "1.3.2"
7-
androidx-compose-ui = "1.2.1"
8-
androidx-test = "1.4.0"
9-
androidx-test-orchestrator = "1.4.1"
10-
androidx-test-espresso = "3.4.0"
7+
androidx-compose-ui = "1.3.1"
8+
androidx-test = "1.5.0"
9+
androidx-test-orchestrator = "1.4.2"
10+
androidx-test-espresso = "3.5.0"
1111
blueprintConfiguration = "1.0.0-SNAPSHOT"
1212
blueprintDependency = "1.0.0-SNAPSHOT"
1313
blueprintTools = "1.0.0-SNAPSHOT"
1414
decompose = "0.8.0"
1515
detekt = "1.21.0"
1616
gitVersion = "0.12.6"
1717
gradleVersionCatalogUpdate = "0.2.2"
18-
gradleVersionUpdate = "0.42.0"
18+
gradleVersionUpdate = "0.44.0"
1919
jacoco = "0.8.7"
2020
jetbrainsAppleGradlePlugin = "212.4638.14-0.15"
21-
jetbrainsCompose = "1.2.0"
22-
jetbrainsComposeCompiler = "1.3.2"
23-
koin = "3.2.2"
21+
jetbrainsCompose = "1.2.1"
22+
jetbrainsComposeCompiler = "1.3.2.1"
23+
koin = "3.3.0"
2424
kotlin = "1.7.20"
2525
kotlinx-coroutines = "1.6.4"
2626
kotlinx-serialization = "1.4.1"
2727
ktlint = "0.47.1"
28-
ktor = "2.1.2"
28+
ktor = "2.1.3"
2929
moko-resources = "0.20.1"
3030
spotless = "6.11.0"
3131
sqlDelight = "1.5.4"
@@ -37,13 +37,13 @@ accompanist-insetsUi = { module = "com.google.accompanist:accompanist-insets-ui"
3737
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
3838
android-desugar = "com.android.tools:desugar_jdk_libs:1.2.2"
3939
androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
40-
androidx-activityCompose = "androidx.activity:activity-compose:1.6.0"
40+
androidx-activityCompose = "androidx.activity:activity-compose:1.6.1"
4141
androidx-appCompat = "androidx.appcompat:appcompat:1.5.1"
4242
androidx-lifecycle-viewmodel = "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
4343
androidx-lifecycle-viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
4444
androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
4545
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-ui" }
46-
androidx-compose-material = "androidx.compose.material:material:1.2.1"
46+
androidx-compose-material = "androidx.compose.material:material:1.3.1"
4747
androidx-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha14"
4848
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose-ui" }
4949
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
@@ -54,7 +54,7 @@ decompose-core = { module = "com.arkivanov.decompose:decompose", version.ref = "
5454
decompose-extensionJetpackCompose = { module = "com.arkivanov.decompose:extensions-compose-jetpack", version.ref = "decompose" }
5555
decompose-extensionJetbrainsCompose = { module = "com.arkivanov.decompose:extensions-compose-jetbrains", version.ref = "decompose" }
5656
essenty-lifecycle = "com.arkivanov.essenty:lifecycle:0.2.2"
57-
google-android-material = "com.google.android.material:material:1.6.1"
57+
google-android-material = "com.google.android.material:material:1.7.0"
5858
gradleAndroidPlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
5959
gradleBlueprintDependencyPlugin = { module = "eu.upwolf.gradle.blueprint.dependency:blueprint-dependency", version.ref = "blueprintDependency" }
6060
gradleDetektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
@@ -100,12 +100,12 @@ sqldelight-coroutinesExtensions = { module = "com.squareup.sqldelight:coroutines
100100
sqldelight-nativeDriver = { module = "com.squareup.sqldelight:native-driver", version.ref = "sqlDelight" }
101101
sqldelight-runtime = { module = "com.squareup.sqldelight:runtime", version.ref = "sqlDelight" }
102102
sqldelight-sqliteDriver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqlDelight" }
103-
test-android-kakaocup-compose = "io.github.kakaocup:compose:0.1.1"
103+
test-android-kakaocup-compose = "io.github.kakaocup:compose:0.2.0"
104104
test-androidx-compose-ui-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose-ui" }
105105
test-androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
106106
test-androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx-test-espresso" }
107107
test-androidx-espresso-web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx-test-espresso" }
108-
test-androidx-extJunitKtx = "androidx.test.ext:junit-ktx:1.1.3"
108+
test-androidx-extJunitKtx = "androidx.test.ext:junit-ktx:1.1.4"
109109
test-androidx-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidx-test-orchestrator" }
110110
test-androidx-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
111111
test-androidx-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }

0 commit comments

Comments
 (0)