From 9e15a889b2b7eb584a8d720d6662680c3cd39c53 Mon Sep 17 00:00:00 2001 From: Baron Roberts Date: Thu, 30 May 2024 17:23:34 -0700 Subject: [PATCH] Migrate to cthing-versioning plugin. --- build.gradle.kts | 19 +++++++------------ gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f75cde3..67654d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,26 +10,24 @@ repositories { mavenCentral() } +buildscript { + repositories { + mavenCentral() + } +} + plugins { `java-gradle-plugin` checkstyle jacoco signing + alias(libs.plugins.cthingVersioning) alias(libs.plugins.dependencyAnalysis) alias(libs.plugins.pluginPublish) alias(libs.plugins.spotbugs) alias(libs.plugins.versions) } -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath(libs.cthingProjectVersion) - } -} - version = ProjectVersion("1.0.2", BuildType.snapshot) group = "org.cthing" description = "A Gradle plugin for counting lines of code." @@ -163,9 +161,6 @@ tasks { publishPlugins { doFirst { - if ((version as ProjectVersion).isSnapshotBuild) { - throw GradleException("Cannot publish a developer build to the Gradle Plugin Portal") - } if (!project.hasProperty("gradle.publish.key") || !project.hasProperty("gradle.publish.secret")) { throw GradleException("Gradle Plugin Portal credentials not defined") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa5ac11..4edd5b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ junit = "5.10.2" spotbugs = "4.8.3" [plugins] +cthingVersioning = { id = "org.cthing.cthing-versioning", version = "1.0.0" } dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "1.30.0" } pluginPublish = { id = "com.gradle.plugin-publish", version = "1.2.1" } spotbugs = { id = "com.github.spotbugs", version = "6.0.7" } @@ -16,7 +17,6 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } assertJ = "org.assertj:assertj-core:3.25.3" commonsIO = "commons-io:commons-io:2.15.1" cthingAnnots = "org.cthing:cthing-annotations:1.0.0" -cthingProjectVersion = "org.cthing:cthing-projectversion:1.0.0" escapers = "org.cthing:escapers:1.0.0" jacksonCoreUtils = "com.github.java-json-tools:jackson-coreutils:2.0" jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }