diff --git a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml b/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml index d3172260426..9ba594e642d 100644 --- 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 index 95b578dabd3..d6d6014abc2 100644 --- 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 index c118ef47580..6cfc97f2cab 100644 --- 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 index 4aa15b25443..8f7f8a6d4dc 100644 --- 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" }