Skip to content

Commit ba1c381

Browse files
committed
Update dependencies
1 parent 0f22694 commit ba1c381

File tree

5 files changed

+43
-23
lines changed

5 files changed

+43
-23
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
Dependencies.Compose.UI_TOOLING,
113113
Dependencies.Compose.ANIMATION,
114114
Dependencies.Compose.RUNTIME,
115-
Dependencies.Compose.MATERIAL,
115+
Dependencies.Compose.MATERIAL_2,
116116
Dependencies.Compose.MATERIAL_3,
117117
Dependencies.Compose.ICONS_EXTENDED,
118118
)

buildSrc/src/main/java/Dependencies.kt

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,27 @@ object Dependencies {
22

33
object AndroidX {
44

5-
const val CORE_KTX = "androidx.core:core-ktx:1.8.0"
6-
const val LIFECYCLE_KTX = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
7-
const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.5.1"
8-
const val NAVIGATION_COMPOSE = "androidx.navigation:navigation-compose:2.5.0"
5+
const val CORE_KTX = "androidx.core:core-ktx:${Versions.CORE}"
6+
const val LIFECYCLE_KTX = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.RUNTIME}"
7+
const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:${Versions.COMPOSE_ACTIVITY}"
8+
const val NAVIGATION_COMPOSE = "androidx.navigation:navigation-compose:${Versions.COMPOSE_NAVIGATION}"
99

1010
object Test {
1111
const val JUNIT = "androidx.test.ext:junit:1.1.3"
12-
const val ESPRESSO_CORE =
13-
"androidx.test.espresso:espresso-core:${Versions.ESPRESSO_CORE}"
12+
const val ESPRESSO_CORE = "androidx.test.espresso:espresso-core:${Versions.ESPRESSO_CORE}"
1413
}
1514
}
1615

1716
object Compose {
1817

1918
const val UI = "androidx.compose.ui:ui:${Versions.COMPOSE}"
2019
const val RUNTIME = "androidx.compose.runtime:runtime:${Versions.COMPOSE}"
21-
const val MATERIAL = "androidx.compose.material:material:${Versions.COMPOSE}"
22-
const val MATERIAL_3 = "androidx.compose.material3:material3:1.0.0-alpha15"
20+
const val MATERIAL_2 = "androidx.compose.material:material:${Versions.COMPOSE}"
21+
const val MATERIAL_3 = "androidx.compose.material3:material3:${Versions.COMPOSE_MD3}"
2322
const val UI_TOOLING = "androidx.compose.ui:ui-tooling-preview:${Versions.COMPOSE}"
24-
const val ICONS_EXTENDED =
25-
"androidx.compose.material:material-icons-extended:${Versions.COMPOSE}"
23+
const val ICONS_EXTENDED = "androidx.compose.material:material-icons-extended:${Versions.COMPOSE}"
2624
const val ANIMATION = "androidx.compose.animation:animation:${Versions.COMPOSE}"
27-
const val ANIMATION_GRAPHICS =
28-
"androidx.compose.animation:animation-graphics:${Versions.COMPOSE}"
25+
const val ANIMATION_GRAPHICS = "androidx.compose.animation:animation-graphics:${Versions.COMPOSE}"
2926

3027
object Test {
3128
const val JUNIT = "androidx.compose.ui:ui-test-junit4:${Versions.COMPOSE}"
@@ -48,17 +45,19 @@ object Dependencies {
4845
}
4946

5047
object Kotlin {
51-
const val GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
48+
49+
const val GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KOTLIN}"
5250
const val KOTLIN_STD = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.KOTLIN}"
5351
}
5452

5553
object Gradle {
56-
const val BUILD = "com.android.tools.build:gradle:7.3.0"
54+
55+
const val BUILD = "com.android.tools.build:gradle:${Versions.GRADLE}"
5756
}
5857

59-
const val DOKKA = "org.jetbrains.dokka:dokka-gradle-plugin:1.6.0"
60-
const val SNAPPER = "dev.chrisbanes.snapper:snapper:0.3.0"
61-
const val DESUGAR = "com.android.tools:desugar_jdk_libs:1.1.5"
58+
const val DOKKA = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.DOKKA}"
59+
const val SNAPPER = "dev.chrisbanes.snapper:snapper:${Versions.SNAPPER}"
60+
const val DESUGAR = "com.android.tools:desugar_jdk_libs:${Versions.DESUGAR}"
6261

63-
const val MAVEN_PUBLISH = "com.vanniktech:gradle-maven-publish-plugin:0.21.0"
62+
const val MAVEN_PUBLISH = "com.vanniktech:gradle-maven-publish-plugin:${Versions.MAVEN_PUBLISH}"
6463
}

buildSrc/src/main/java/LibraryModulePlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class LibraryModulePlugin : Plugin<Project> {
4545
Dependencies.Compose.ANIMATION,
4646
Dependencies.Compose.ANIMATION_GRAPHICS,
4747
Dependencies.Compose.RUNTIME,
48-
Dependencies.Compose.MATERIAL,
4948
Dependencies.Compose.MATERIAL_3,
5049
Dependencies.Compose.ICONS_EXTENDED,
5150
)

buildSrc/src/main/java/Plugins.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Plugins {
44

55
val APPLICATION = Plugin("com.android.application", "7.2.2")
66
val LIBRARY = Plugin("com.android.library", "7.2.2")
7-
val KOTLIN = Plugin("org.jetbrains.kotlin.android", "1.7.0")
7+
val KOTLIN = Plugin("org.jetbrains.kotlin.android", Versions.KOTLIN)
88
val SPOTLESS = Plugin("com.diffplug.spotless", "6.10.0")
99
val MAVEN_PUBLISH = Plugin("com.vanniktech.maven.publish")
1010
val DOKKA = Plugin("org.jetbrains.dokka", "1.7.10")

buildSrc/src/main/java/Versions.kt

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
11
object Versions {
22

3-
const val KOTLIN = "1.7.0"
4-
const val COMPOSE = "1.2.0"
3+
// Kotlin
54

5+
const val KOTLIN = "1.7.10"
6+
7+
// Compose
8+
9+
const val COMPOSE = "1.3.0"
10+
const val COMPOSE_MD3 = "1.0.0"
11+
12+
// AndroidX
13+
14+
const val CORE = "1.9.0"
15+
const val RUNTIME = "2.5.1"
16+
const val COMPOSE_ACTIVITY = "1.5.0"
17+
const val COMPOSE_NAVIGATION = "2.5.3"
18+
19+
// Misc
20+
21+
const val GRADLE = "7.3.0"
22+
const val DESUGAR = "1.1.5"
23+
const val MAVEN_PUBLISH = "0.21.0"
24+
25+
const val SNAPPER = "0.3.0"
26+
27+
const val DOKKA = "1.6.0"
628
const val KT_LINT = "0.47.1"
729

830
// Test

0 commit comments

Comments
 (0)