Skip to content

Commit 6de3fc5

Browse files
committed
Move rest of the plugins to lib.toml
1 parent 6800f08 commit 6de3fc5

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import java.util.Properties
55
import java.io.FileInputStream
66

77
plugins {
8-
id("com.android.application")
9-
id("com.google.devtools.ksp")
8+
alias(libs.plugins.androidApplication)
9+
alias(libs.plugins.ksp)
1010
// rethink-tv fork: Compose Compiler plugin for the `tv` flavor's
1111
// Compose-for-TV UI. Safe to apply project-wide — phone variants
1212
// contain no @Composable and the plugin then no-ops.
13-
id("org.jetbrains.kotlin.plugin.compose")
13+
alias(libs.plugins.kotlinCompose)
1414
// To generate a BOM in CycloneDX format:
1515
// ./gradlew cyclonedxBom
1616
// id("org.cyclonedx.bom") version "3.2.4"

‎benchmark/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("com.android.test")
2+
alias(libs.plugins.androidTest)
33
}
44

55
android {

‎build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ buildscript {
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath(libs.androidToolsBuildGradle)
1211
classpath(libs.jetbrainsKotlinKotlinGradlePlugin)
13-
// Required by the TV flavor's Compose UI.
14-
classpath(libs.jetbrainsKotlinComposeCompilerGradlePlugin)
1512

1613
// add firebase plugins - will be conditionally applied in app/build.gradle
1714
val taskNames = gradle.startParameter.taskNames.joinToString(",").lowercase()

‎gradle/lib.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ uiautomator = "2.3.0"
6363
ksp = "2.3.9"
6464

6565
[libraries]
66-
androidToolsBuildGradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
6766
jetbrainsKotlinKotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
68-
jetbrainsKotlinComposeCompilerGradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
6967
googleGmsGoogleServices = { module = "com.google.gms:google-services", version.ref = "googleServices" }
7068
googleFirebaseFirebaseCrashlyticsGradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsGradle" }
7169
googleGuavaGuava = { module = "com.google.guava:guava", version.ref = "guava" }
@@ -161,4 +159,8 @@ androidxBenchmarkBenchmarkMacroJunit4 = { module = "androidx.benchmark:benchmark
161159
androidxTestUiautomatorUiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
162160

163161
[plugins]
162+
androidApplication = { id = "com.android.application", version.ref = "agp" }
163+
androidTest = { id = "com.android.test", version.ref = "agp" }
164+
# Required by the TV flavor's Compose UI.
165+
kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
164166
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

0 commit comments

Comments
 (0)