diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000000..2cf6a3cb33d --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,12 @@ +[versions] +gradle-custom-user-data = "1.9" +gradle-enterprise = "3.12.4" +# Version for foojay should be also synced with version in repo/gradle-settings-conventions/settings.gradle.kts +gradle-toolchains-foojay-resolver = "0.4.0" +kotlinx-serialization = "1.5.0" + +[libraries] +gradle-customUserData-gradle-plugin = { module = "com.gradle:common-custom-user-data-gradle-plugin", version.ref = "gradle-custom-user-data" } +gradle-enterprise-gradle-plugin = { module = "com.gradle:gradle-enterprise-gradle-plugin", version.ref = "gradle-enterprise" } +gradle-toolchainsFoojayResolver-gradle-plugin = { module = "org.gradle.toolchains:foojay-resolver", version.ref = "gradle-toolchains-foojay-resolver" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } diff --git a/repo/gradle-settings-conventions/gradle-enterprise/build.gradle.kts b/repo/gradle-settings-conventions/gradle-enterprise/build.gradle.kts index 673f87d8f15..5bea9b90875 100644 --- a/repo/gradle-settings-conventions/gradle-enterprise/build.gradle.kts +++ b/repo/gradle-settings-conventions/gradle-enterprise/build.gradle.kts @@ -14,6 +14,6 @@ kotlin.jvmToolchain(8) val buildGradlePluginVersion = extra.get("kotlin.build.gradlePlugin.version") dependencies { implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion") - implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.4") - implementation("com.gradle:common-custom-user-data-gradle-plugin:1.9") + implementation(libs.gradle.enterprise.gradle.plugin) + implementation(libs.gradle.customUserData.gradle.plugin) } diff --git a/repo/gradle-settings-conventions/internal-gradle-setup/build.gradle.kts b/repo/gradle-settings-conventions/internal-gradle-setup/build.gradle.kts index 3f1d999e6c1..2befac5b261 100644 --- a/repo/gradle-settings-conventions/internal-gradle-setup/build.gradle.kts +++ b/repo/gradle-settings-conventions/internal-gradle-setup/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") + implementation(libs.kotlinx.serialization.json) implementation(kotlin("test-junit5")) } diff --git a/repo/gradle-settings-conventions/jvm-toolchain-provisioning/build.gradle.kts b/repo/gradle-settings-conventions/jvm-toolchain-provisioning/build.gradle.kts index d23a3d70f0b..68f7f7ece11 100644 --- a/repo/gradle-settings-conventions/jvm-toolchain-provisioning/build.gradle.kts +++ b/repo/gradle-settings-conventions/jvm-toolchain-provisioning/build.gradle.kts @@ -9,7 +9,7 @@ repositories { } dependencies { - implementation("org.gradle.toolchains:foojay-resolver:0.4.0") + implementation(libs.gradle.toolchainsFoojayResolver.gradle.plugin) } kotlin.jvmToolchain(8) diff --git a/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts b/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts index a8298309d61..3ae71e6294d 100644 --- a/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts +++ b/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts @@ -9,7 +9,6 @@ repositories { } dependencies { - // TODO: migrate to api only dependency once Kotlin daemon configuration will be available there (Yahor) implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api") } diff --git a/repo/gradle-settings-conventions/settings.gradle.kts b/repo/gradle-settings-conventions/settings.gradle.kts index 9c60670236b..98c0527a0cf 100644 --- a/repo/gradle-settings-conventions/settings.gradle.kts +++ b/repo/gradle-settings-conventions/settings.gradle.kts @@ -17,9 +17,18 @@ buildscript { } plugins { + // Version here should be also synced with the version in 'libs.versions.toml' id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" } +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../../gradle/libs.versions.toml")) + } + } +} + include(":build-cache") include(":gradle-enterprise") include(":jvm-toolchain-provisioning")