From bf6a36ad074780bd433e6da48325227871d5dbe7 Mon Sep 17 00:00:00 2001 From: Kengo TODA Date: Sat, 31 Dec 2022 07:25:57 +0800 Subject: [PATCH] build: introduce version catalog Signed-off-by: Kengo TODA --- build.gradle.kts | 10 ++++------ buildSrc/build.gradle.kts | 4 ++-- buildSrc/settings.gradle.kts | 7 +++++++ gradle/libs.versions.toml | 10 ++++++++++ 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 buildSrc/settings.gradle.kts create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle.kts b/build.gradle.kts index 4d33639c..8e579d06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,13 +11,11 @@ plugins { group = "jp.skypencil.errorprone.slf4j" -val errorproneVersion = "2.16" - dependencies { - compileOnly("com.google.errorprone:error_prone_check_api:$errorproneVersion") - errorprone("com.google.errorprone:error_prone_core:$errorproneVersion") - testImplementation("com.google.errorprone:error_prone_check_api:$errorproneVersion") - testImplementation("com.google.errorprone:error_prone_test_helpers:$errorproneVersion") + compileOnly(libs.errorprone.check.api) + errorprone(libs.errorprone.core) + testImplementation(libs.errorprone.check.api) + testImplementation(libs.errorprone.test.helpers) } val exportsArgs = listOf( diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3262d455..7ee59540 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `kotlin-dsl` - id("com.diffplug.spotless") version "6.11.0" + alias(libs.plugins.spotless) } repositories { @@ -9,7 +9,7 @@ repositories { } dependencies { - implementation("com.diffplug.spotless:spotless-plugin-gradle:6.12.0") + implementation("com.diffplug.spotless:spotless-plugin-gradle:${libs.plugins.spotless.get().version}") implementation("io.github.gradle-nexus:publish-plugin:1.1.0") implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1") implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513") diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 00000000..b5a0fabf --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..78bb79ed --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,10 @@ +[versions] +errorprone = "2.16" + +[libraries] +errorprone-check-api = { module = "com.google.errorprone:error_prone_check_api", version.ref = "errorprone" } +errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" } +errorprone-test-helpers = { module = "com.google.errorprone:error_prone_test_helpers", version.ref = "errorprone" } + +[plugins] +spotless = { id = "com.diffplug.spotless", version = "6.12.0" }