Merge branch 'main' into rl.function.call.wrap

firebase · Sep 27, 2024 · e64ff6b · e64ff6b
2 parents 744b00b + ffcc8ba
commit e64ff6b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml b/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
@@ -1,10 +1,8 @@
 [versions]
 androidGradlePlugin = "8.2.1"
-kotlin = "1.8.22"
 
 [libraries]
 android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
 
 [plugins]
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 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
@@ -16,7 +16,7 @@
 
 plugins {
   `java-gradle-plugin`
-  alias(libs.plugins.kotlin.jvm)
+  alias(firebaseLibs.plugins.kotlin.jvm)
   alias(libs.plugins.spotless)
 }
 

diff --git a/firebase-dataconnect/gradleplugin/settings.gradle.kts b/firebase-dataconnect/gradleplugin/settings.gradle.kts
@@ -30,6 +30,13 @@ dependencyResolutionManagement {
     google()
     mavenCentral()
   }
+
+  // Reuse libs.version.toml from the main Gradle project.
+  versionCatalogs {
+    create("firebaseLibs") {
+      from(files("../../gradle/libs.versions.toml"))
+    }
+  }
 }
 
 include(":plugin")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -91,4 +91,5 @@ kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-prope
 playservices = ["playservices-base", "playservices-basement", "playservices-tasks"]
 
 [plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization-plugin" }