From c075bbfa1e0c491f7cb0f166c03d4c3b94c11732 Mon Sep 17 00:00:00 2001 From: Infendro Date: Sat, 13 Dec 2025 01:16:24 +0100 Subject: [PATCH] use common plugin --- build.gradle.kts | 43 ++++++++++----------------------------- gradle/libs.versions.toml | 6 ++++-- settings.gradle.kts | 5 +++++ 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ec66cd8..89bb4ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,11 @@ +import com.infendro.plugin.infendro +import com.infendro.plugin.token + group = "com.infendro" version = "1.2.0" -repositories { - maven("https://git.infendro.com/api/packages/Infendro/maven") - mavenCentral() -} - plugins { + alias(libs.plugins.infendro) alias(libs.plugins.multiplatform) id("maven-publish") } @@ -18,6 +17,11 @@ kotlin { } linuxX64() + repositories { + infendro() + mavenCentral() + } + sourceSets { commonMain.dependencies { implementation(libs.hash) @@ -33,31 +37,6 @@ kotlin { } } -publishing { - repositories { - maven { - url = uri("https://git.infendro.com/api/packages/Infendro/maven") - authentication.create("header", HttpHeaderAuthentication::class) - credentials(HttpHeaderCredentials::class) { - val token = secret("git.token") ?: throw GradleException() - - name = "Authorization" - value = "token $token" - } - } - } -} - -fun secret( - key: String, -): String? { - val property = key - val environment = key - .uppercase() - .replace(".", "__") - - val prop = properties[property] as String? - val env = System.getenv(environment) - - return prop ?: env +publishing.repositories { + infendro(token) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6ad94e..4b5468d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,11 @@ [versions] -kotlin = "2.1.20" +infendro = "1.0.0" +kotlin = "2.2.21" hash = "1.3.2" -bytearray = "1.2.2" +bytearray = "1.2.4" [plugins] +infendro = { id = "com.infendro.plugin", version.ref = "infendro" } multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index a1728eb..9190876 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,6 @@ rootProject.name = "mac" + +pluginManagement.repositories { + maven("https://git.infendro.com/api/packages/Infendro/maven") + mavenCentral() +}