From 69fcf6525f2c529474ec1e36f10d924b70d339ed Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 30 Sep 2024 18:48:16 +0000
Subject: [PATCH] Use gradle/libs.versions.toml to specify the spotless version

---
 build.gradle                                                | 2 +-
 firebase-dataconnect/gradleplugin/gradle/libs.versions.toml | 2 --
 firebase-dataconnect/gradleplugin/plugin/build.gradle.kts   | 2 +-
 gradle/libs.versions.toml                                   | 3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 firebase-dataconnect/gradleplugin/gradle/libs.versions.toml

diff --git a/build.gradle b/build.gradle
index 93169363221..5da603fb4ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA1"
+        classpath libs.spotless.plugin.gradle
     }
 }
 
diff --git a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml b/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
deleted file mode 100644
index 65506053b3e..00000000000
--- a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[plugins]
-spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA1" }
diff --git a/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts b/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
index 1735f7c00ef..56d61875e4b 100644
--- a/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
+++ b/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
   `java-gradle-plugin`
   alias(firebaseLibs.plugins.kotlin.jvm)
-  alias(libs.plugins.spotless)
+  alias(firebaseLibs.plugins.spotless)
 }
 
 java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd51263275b..c10913eff8e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ protobufjavautil = "3.21.11"
 kotest = "5.9.1"
 quickcheck = "0.6"
 serialization = "1.5.1"
+spotless = "7.0.0.BETA1"
 androidx-test-core="1.5.0"
 androidx-test-junit="1.1.5"
 androidx-test-truth = "1.5.0"
@@ -88,6 +89,7 @@ kotest-assertions = { module = "io.kotest:kotest-assertions-core-jvm", version.r
 kotest-property = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
 kotest-property-arbs = { module = "io.kotest.extensions:kotest-property-arbs", version = "2.1.2" }
 quickcheck = { module = "net.java:quickcheck", version.ref = "quickcheck" }
+spotless-plugin-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" }
 
 [bundles]
@@ -97,3 +99,4 @@ playservices = ["playservices-base", "playservices-basement", "playservices-task
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization-plugin" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }