From bf25fa7f8957c43c17f5496ff481473f7334a383 Mon Sep 17 00:00:00 2001 From: Baron Roberts Date: Sun, 26 May 2024 13:04:50 -0700 Subject: [PATCH] Migrate to cthing-projectversion. --- build.gradle.kts | 19 +++++++++++++------ gradle/libs.versions.toml | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 519116b..29c82c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,7 @@ import com.github.spotbugs.snom.Confidence import com.github.spotbugs.snom.Effort +import org.cthing.projectversion.BuildType +import org.cthing.projectversion.ProjectVersion import java.text.SimpleDateFormat import java.util.* @@ -18,12 +20,16 @@ plugins { alias(libs.plugins.versions) } -val baseVersion = "0.1.0" -val isSnapshot = true +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath(libs.cthingProjectVersion) + } +} -val isCIServer = System.getenv("CTHING_CI") != null -val buildNumber = if (isCIServer) System.currentTimeMillis().toString() else "0" -version = if (isSnapshot) "$baseVersion-$buildNumber" else baseVersion +version = ProjectVersion("0.1.0", BuildType.snapshot) group = "org.cthing" description = "A port of the Molinillo generic dependency resolution algorithm to Java." @@ -213,7 +219,8 @@ publishing { } } - val repoUrl = if (isSnapshot) findProperty("cthing.nexus.snapshotsUrl") else findProperty("cthing.nexus.candidatesUrl") + val repoUrl = if ((version as ProjectVersion).isSnapshotBuild) + findProperty("cthing.nexus.snapshotsUrl") else findProperty("cthing.nexus.candidatesUrl") if (repoUrl != null) { repositories { maven { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cef1262..d8140ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } [libraries] assertJ = "org.assertj:assertj-core:3.25.3" cthingAnnots = "org.cthing:cthing-annotations:1.0.0" +cthingProjectVersion = "org.cthing:cthing-projectversion:1.0.0" equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.15.6" jacksonAnnots = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" } jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }