From bc2b4ca93fa5ec6af4c5de8502f8f971576f0b91 Mon Sep 17 00:00:00 2001 From: Swordsteel Date: Mon, 7 Apr 2025 17:20:41 +0200 Subject: [PATCH] add hlaeja version catalog - remove repositories from build.gradle.kts - change to settings.gradle.kts - add dependency resolution management - add plugin management repositories - add catalog in gradle.properties --- build.gradle.kts | 4 ---- gradle.properties | 1 + settings.gradle.kts | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 08fcab6..1f18cb4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,10 +13,6 @@ java { } } -repositories { - mavenCentral() -} - dependencies { implementation("org.springframework.boot:spring-boot-starter") implementation("org.jetbrains.kotlin:kotlin-reflect") diff --git a/gradle.properties b/gradle.properties index 6604987..91e878c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ kotlin.code.style=official version=0.1.0-SNAPSHOT +catalog=0.10.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index a07a927..f81508c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,37 @@ +import java.lang.System.getenv + +fun getProperty(property: String): String = extra[property] as String + +fun retrieveConfiguration( + property: String, + environment: String, +): String? = if (extra.has(property)) getProperty(property) else getenv(environment) + +fun hlaejaRepository(repositoryHandler: RepositoryHandler) { + repositoryHandler.maven { + url = uri("https://maven.pkg.github.com/swordsteel/**") + name = "GitHubPackages" + credentials { + username = retrieveConfiguration("repository.user", "REPOSITORY_USER") + password = retrieveConfiguration("repository.token", "REPOSITORY_TOKEN") + } + } +} + +dependencyResolutionManagement { + @Suppress("UnstableApiUsage") + repositories { + mavenLocal() + hlaejaRepository(this) + mavenCentral() + } + versionCatalogs.create("hlaeja").from("ltd.hlaeja.catalog:hlaeja-version-catalog:${getProperty("catalog")}") +} + +pluginManagement.repositories { + mavenLocal() + hlaejaRepository(this) + gradlePluginPortal() +} + rootProject.name = "hlaeja-service"