Skip to content

Commit 64cb2ef

Browse files
zsmb13zsmb13
authored
Move all plugins to version catalog (#1082)
Updates the build files to use version catalog declarations for all plugin usages. (Small bonus: moves Jetcaster's Room usage from kapt to KSP.)
2 parents 74b63c8 + d802588 commit 64cb2ef

29 files changed

+215
-128
lines changed

‎Crane/app/build.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
* limitations under the License.
1717
*/
1818

19+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
1920
plugins {
20-
id("com.android.application")
21-
id("kotlin-android")
22-
id("kotlin-kapt")
23-
id("dagger.hilt.android.plugin")
24-
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
21+
alias(libs.plugins.android.application)
22+
alias(libs.plugins.kotlin.android)
23+
alias(libs.plugins.kapt)
24+
alias(libs.plugins.hilt)
25+
alias(libs.plugins.secrets)
2526
}
2627

2728
android {

‎Crane/benchmark/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
12
plugins {
2-
id("com.android.test")
3-
id("org.jetbrains.kotlin.android")
3+
alias(libs.plugins.android.test)
4+
alias(libs.plugins.kotlin.android)
45
}
56

67
android {

‎Crane/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ buildscript {
2323
maven { url = uri("https://androidx.dev/snapshots/builds/${libs.versions.compose.snapshot.get()}/artifacts/repository/") }
2424
}
2525
}
26-
dependencies {
27-
classpath(libs.android.gradlePlugin)
28-
classpath(libs.hilt.gradlePlugin)
29-
classpath(libs.kotlin.gradlePlugin)
30-
classpath(libs.secrets.gradlePlugin)
31-
}
3226
}
3327

3428
subprojects {
@@ -37,9 +31,11 @@ subprojects {
3731
mavenCentral()
3832
}
3933
}
34+
35+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
4036
plugins {
41-
id("com.github.ben-manes.versions") version "0.43.0"
42-
id("nl.littlerobots.version-catalog-update") version "0.7.0"
37+
alias(libs.plugins.gradle.versions)
38+
alias(libs.plugins.version.catalog.update)
4339
}
4440

4541
apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

‎Crane/gradle/libs.versions.toml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ compose-compiler = "1.4.0"
3030
compose-snapshot = "-"
3131
coroutines = "1.6.4"
3232
google-maps = "18.1.0"
33+
gradle-versions = "0.43.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
3637
jdkDesugar = "1.2.2"
3738
junit = "4.13.2"
3839
kotlin = "1.8.0"
40+
ksp = "1.8.0-1.0.9"
3941
maps-compose = "2.5.3"
4042
material = "1.9.0-alpha01"
4143
# @keep
@@ -45,6 +47,7 @@ robolectric = "4.9.2"
4547
rome = "1.18.0"
4648
room = "2.5.0"
4749
secrets = "2.0.1"
50+
version-catalog-update = "0.7.0"
4851
# @keep
4952
targetSdk = "33"
5053

@@ -54,7 +57,6 @@ accompanist-pager = { module = "com.google.accompanist:accompanist-pager", versi
5457
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
5558
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
5659
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
57-
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
5860
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
5961
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
6062
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
@@ -112,9 +114,7 @@ hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt"
112114
hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
113115
hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
114116
hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" }
115-
hilt-gradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
116117
junit = { module = "junit:junit", version.ref = "junit" }
117-
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
118118
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
119119
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
120120
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -123,4 +123,15 @@ okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
123123
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
124124
rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" }
125125
rometools-rome = { module = "com.rometools:rome", version.ref = "rome" }
126-
secrets-gradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secrets" }
126+
127+
[plugins]
128+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
129+
android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
130+
gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
131+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
132+
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
133+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
134+
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
135+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
136+
secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
137+
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }

‎JetLagged/app/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
1718
plugins {
18-
id("com.android.application")
19-
id("kotlin-android")
20-
id("kotlin-parcelize")
19+
alias(libs.plugins.android.application)
20+
alias(libs.plugins.kotlin.android)
21+
alias(libs.plugins.kotlin.parcelize)
2122
}
2223

2324
android {

‎JetLagged/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ buildscript {
2323
maven { url = uri("https://androidx.dev/snapshots/builds/${libs.versions.compose.snapshot.get()}/artifacts/repository/") }
2424
}
2525
}
26-
dependencies {
27-
classpath(libs.android.gradlePlugin)
28-
classpath(libs.kotlin.gradlePlugin)
29-
}
3026
}
3127

3228
subprojects {
@@ -36,9 +32,10 @@ subprojects {
3632
}
3733
}
3834

35+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
3936
plugins {
40-
id("com.github.ben-manes.versions") version "0.43.0"
41-
id("nl.littlerobots.version-catalog-update") version "0.7.0"
37+
alias(libs.plugins.gradle.versions)
38+
alias(libs.plugins.version.catalog.update)
4239
}
4340

4441
apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

‎JetLagged/gradle/libs.versions.toml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ compose-compiler = "1.4.0"
3030
compose-snapshot = "-"
3131
coroutines = "1.6.4"
3232
google-maps = "18.1.0"
33+
gradle-versions = "0.43.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
3637
jdkDesugar = "1.2.2"
3738
junit = "4.13.2"
3839
kotlin = "1.8.0"
40+
ksp = "1.8.0-1.0.9"
3941
maps-compose = "2.5.3"
4042
material = "1.9.0-alpha01"
4143
# @keep
@@ -45,6 +47,7 @@ robolectric = "4.9.2"
4547
rome = "1.18.0"
4648
room = "2.5.0"
4749
secrets = "2.0.1"
50+
version-catalog-update = "0.7.0"
4851
# @keep
4952
targetSdk = "33"
5053

@@ -54,7 +57,6 @@ accompanist-pager = { module = "com.google.accompanist:accompanist-pager", versi
5457
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
5558
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
5659
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
57-
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
5860
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
5961
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
6062
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
@@ -112,9 +114,7 @@ hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt"
112114
hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
113115
hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
114116
hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" }
115-
hilt-gradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
116117
junit = { module = "junit:junit", version.ref = "junit" }
117-
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
118118
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
119119
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
120120
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -123,4 +123,15 @@ okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
123123
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
124124
rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" }
125125
rometools-rome = { module = "com.rometools:rome", version.ref = "rome" }
126-
secrets-gradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secrets" }
126+
127+
[plugins]
128+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
129+
android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
130+
gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
131+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
132+
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
133+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
134+
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
135+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
136+
secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
137+
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }

‎JetNews/app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
1718
plugins {
18-
id("com.android.application")
19-
id("kotlin-android")
19+
alias(libs.plugins.android.application)
20+
alias(libs.plugins.kotlin.android)
2021
}
2122

2223
android {

‎JetNews/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ buildscript {
2323
maven { url = uri("https://androidx.dev/snapshots/builds/${libs.versions.compose.snapshot.get()}/artifacts/repository/") }
2424
}
2525
}
26-
dependencies {
27-
classpath(libs.android.gradlePlugin)
28-
classpath(libs.kotlin.gradlePlugin)
29-
}
3026
}
3127

3228
subprojects {
@@ -36,9 +32,10 @@ subprojects {
3632
}
3733
}
3834

35+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
3936
plugins {
40-
id("com.github.ben-manes.versions") version "0.43.0"
41-
id("nl.littlerobots.version-catalog-update") version "0.7.0"
37+
alias(libs.plugins.gradle.versions)
38+
alias(libs.plugins.version.catalog.update)
4239
}
4340

4441
apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

‎JetNews/gradle/libs.versions.toml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ compose-compiler = "1.4.0"
3030
compose-snapshot = "-"
3131
coroutines = "1.6.4"
3232
google-maps = "18.1.0"
33+
gradle-versions = "0.43.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
3637
jdkDesugar = "1.2.2"
3738
junit = "4.13.2"
3839
kotlin = "1.8.0"
40+
ksp = "1.8.0-1.0.9"
3941
maps-compose = "2.5.3"
4042
material = "1.9.0-alpha01"
4143
# @keep
@@ -45,6 +47,7 @@ robolectric = "4.9.2"
4547
rome = "1.18.0"
4648
room = "2.5.0"
4749
secrets = "2.0.1"
50+
version-catalog-update = "0.7.0"
4851
# @keep
4952
targetSdk = "33"
5053

@@ -54,7 +57,6 @@ accompanist-pager = { module = "com.google.accompanist:accompanist-pager", versi
5457
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
5558
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
5659
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
57-
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
5860
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
5961
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
6062
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
@@ -112,9 +114,7 @@ hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt"
112114
hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
113115
hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
114116
hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" }
115-
hilt-gradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
116117
junit = { module = "junit:junit", version.ref = "junit" }
117-
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
118118
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
119119
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
120120
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -123,4 +123,15 @@ okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
123123
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
124124
rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" }
125125
rometools-rome = { module = "com.rometools:rome", version.ref = "rome" }
126-
secrets-gradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secrets" }
126+
127+
[plugins]
128+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
129+
android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
130+
gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
131+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
132+
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
133+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
134+
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
135+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
136+
secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
137+
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }

0 commit comments

Comments
 (0)