Skip to content

Commit bd16333

Browse files
DrjackyDrjacky
committed
Migrate convention plugins to version catalog
1 parent be6015e commit bd16333

9 files changed

Lines changed: 31 additions & 22 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id("app.android.application")
3-
id("app.android.application.compose")
4-
id("app.hilt")
2+
alias(libs.plugins.app.android.application)
3+
alias(libs.plugins.app.android.application.compose)
4+
alias(libs.plugins.app.hilt)
55
alias(libs.plugins.kotlin.serialization)
6-
id("app.kotlin.serialization")
6+
alias(libs.plugins.app.kotlin.serialization)
77
id("kotlin-parcelize")
88
}
99

‎core/common/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.hilt)
44
}
55

66
android {

‎core/data/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.hilt)
44
alias(libs.plugins.kotlin.serialization)
5-
id("app.kotlin.serialization")
5+
alias(libs.plugins.app.kotlin.serialization)
66
id("kotlin-parcelize")
77
}
88

‎core/domain/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.hilt)
44
id("kotlin-parcelize")
55
}
66

‎core/network/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.hilt)
44
alias(libs.plugins.kotlin.serialization)
5-
id("app.kotlin.serialization")
5+
alias(libs.plugins.app.kotlin.serialization)
66
}
77

88
android {

‎core/testing/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("app.android.library")
2+
alias(libs.plugins.app.android.library)
33
}
44

55
android {

‎core/ui/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.android.library.compose")
4-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.android.library.compose)
4+
alias(libs.plugins.app.hilt)
55
}
66

77
android {

‎feature/products/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id("app.android.library")
3-
id("app.android.library.compose")
4-
id("app.hilt")
2+
alias(libs.plugins.app.android.library)
3+
alias(libs.plugins.app.android.library.compose)
4+
alias(libs.plugins.app.hilt)
55
alias(libs.plugins.kotlin.serialization)
6-
id("app.kotlin.serialization")
6+
alias(libs.plugins.app.kotlin.serialization)
77
id("kotlin-parcelize")
88
}
99

‎gradle/libs.versions.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,15 @@ detekt-twitter-compose-rules = { group = "com.twitter.compose.rules", name = "de
185185
detekt-kode-compose-rules = { group = "ru.kode", name = "detekt-rules-compose", version.ref = "detektComposeRulesKode" }
186186

187187
[plugins]
188+
# Convention plugins (provided by build-logic, no version needed)
189+
app-android-application = { id = "app.android.application" }
190+
app-android-application-compose = { id = "app.android.application.compose" }
191+
app-android-library = { id = "app.android.library" }
192+
app-android-library-compose = { id = "app.android.library.compose" }
193+
app-android-lint = { id = "app.android.lint" }
194+
app-hilt = { id = "app.hilt" }
195+
app-kotlin-serialization = { id = "app.kotlin.serialization" }
196+
188197
# External plugins
189198
android-application = { id = "com.android.application", version.ref = "agp" }
190199
android-library = { id = "com.android.library", version.ref = "agp" }

0 commit comments

Comments
 (0)