Skip to content

Use gradle/libs.versions.toml to specify the Android Gradle Plugin version #6321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Use gradle/libs.versions.toml to specify the Android Gradle Plugin version #6321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff8484
Use gradle/libs.versions.toml to specify the Android Gradle Plugin ve…
dconeybe Sep 27, 2024
6002848
Merge branch 'main' into dconeybe/GradlePluginVersionIntoLibsVersions…
dconeybe Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ dependencies {

implementation(libs.kotlinx.serialization.json)
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.android.tools.build:gradle:8.2.1")
implementation("com.android.tools.build:builder-test-api:8.2.1")
implementation(libs.android.gradlePlugin.gradle)
implementation(libs.android.gradlePlugin.builder.test.api)

testImplementation(libs.bundles.kotest)
testImplementation("junit:junit:4.13.2")
Expand Down
6 changes: 0 additions & 6 deletions firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
[versions]
androidGradlePlugin = "8.2.1"

[libraries]
android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }

[plugins]
spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA1" }
2 changes: 1 addition & 1 deletion firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }

dependencies {
compileOnly(libs.android.gradlePlugin.api)
compileOnly(firebaseLibs.android.gradlePlugin.gradle.api)
implementation(gradleKotlinDsl())
}

Expand Down
4 changes: 4 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# javalite, protoc and protobufjavautil versions should be in sync while updating and
# it needs to match the protobuf version which grpc has transitive dependency on, which
# needs to match the version of grpc that grpc-kotlin has a transitive dependency on.
androidGradlePlugin = "8.2.1"
android-lint = "31.3.2"
autovalue = "1.10.1"
coroutines = "1.7.3"
Expand All @@ -24,6 +25,9 @@ androidx-test-junit="1.1.5"
androidx-test-truth = "1.5.0"

[libraries]
android-gradlePlugin-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
android-gradlePlugin-gradle-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
android-gradlePlugin-builder-test-api = { group = "com.android.tools.build", name = "builder-test-api", version.ref = "androidGradlePlugin" }
android-lint = { module = "com.android.tools.lint:lint", version.ref = "android-lint" }
android-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "android-lint" }
android-lint-checks = { module = "com.android.tools.lint:lint-checks", version.ref = "android-lint" }
Expand Down
Loading