From db5fbc8dfc21207c221ad5ab755380b03f6da766 Mon Sep 17 00:00:00 2001 From: ciscoo Date: Wed, 10 Jul 2024 22:25:55 -0500 Subject: [PATCH] Migrate plugins to version catalog --- documentation/documentation.gradle.kts | 6 +++--- gradle/libs.versions.toml | 5 +++++ settings.gradle.kts | 4 ---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts index e667c1d..edbcd67 100644 --- a/documentation/documentation.gradle.kts +++ b/documentation/documentation.gradle.kts @@ -2,9 +2,9 @@ import org.gradle.util.GradleVersion plugins { `java-library-conventions` - id("com.diffplug.spotless") - id("org.asciidoctor.jvm.convert") - id("org.ajoberstar.git-publish") + alias(libs.plugins.spotless) + alias(libs.plugins.asciidoctorJvmConvert) + alias(libs.plugins.gitPublish) } description = "CXF Codegen documentation" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c6b822..3c515dd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,3 +11,8 @@ javapoet = { module = "com.squareup:javapoet", version = "1.13.0" } gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" } gradle-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" } slf4jNop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4j" } # Unused; exists to allow automatic updates. + +[plugins] +gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.1" } +asciidoctorJvmConvert = { id = "org.asciidoctor.jvm.convert", version = "4.0.2" } +spotless = { id = "com.diffplug.spotless" } diff --git a/settings.gradle.kts b/settings.gradle.kts index a09c572..9d37925 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,10 +3,6 @@ pluginManagement { mavenCentral() gradlePluginPortal() } - plugins { - id("org.asciidoctor.jvm.convert") version "4.0.2" - id("org.ajoberstar.git-publish") version "4.2.1" - } } rootProject.name = "cxf-codegen-gradle"