From cc37d6bcb037b5396ab1c4a47de7f293cb54448e Mon Sep 17 00:00:00 2001 From: Infendro Date: Sat, 13 Dec 2025 02:01:33 +0100 Subject: [PATCH] use common plugin --- .gitea/workflows/main.yaml | 2 +- build.gradle.kts | 13 ++++++++----- gradle/libs.versions.toml | 12 +++++++----- settings.gradle.kts | 5 +++++ src/commonMain/kotlin/com/infendro/ddns/Main.kt | 2 +- .../kotlin/com/infendro/ddns/argument/IpService.kt | 5 ++--- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 648b3e2..04b02a7 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -4,7 +4,7 @@ on: - main env: - GIT__TOKEN: ${{ secrets.TOKEN }} + INFENDRO__TOKEN: ${{ secrets.TOKEN }} jobs: release: diff --git a/build.gradle.kts b/build.gradle.kts index 1d769cd..ea37003 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,10 @@ +import com.infendro.plugin.infendro + group = "com.infendro" version = "1.0.0" -repositories { - maven("https://git.infendro.com/api/packages/Infendro/maven") - mavenCentral() -} - plugins { + alias(libs.plugins.infendro) alias(libs.plugins.multiplatform) alias(libs.plugins.serialization) } @@ -18,6 +16,11 @@ kotlin { } } + repositories { + infendro() + mavenCentral() + } + sourceSets { commonMain.dependencies { implementation(libs.io) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af8c527..17c87d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,14 @@ [versions] -kotlin = "2.1.21" -io = "0.7.0" +infendro = "1.0.0" +kotlin = "2.2.21" +io = "0.8.2" coroutines = "1.10.2" -serialization = "1.8.1" -cli = "1.2.2" -ktor = "3.1.2" +serialization = "1.9.0" +cli = "1.3.0" +ktor = "3.3.3" [plugins] +infendro = { id = "com.infendro.plugin", version.ref = "infendro" } multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index f231f76..ae9dc1b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,6 @@ rootProject.name = "ddns" + +pluginManagement.repositories { + maven("https://git.infendro.com/api/packages/Infendro/maven") + mavenCentral() +} diff --git a/src/commonMain/kotlin/com/infendro/ddns/Main.kt b/src/commonMain/kotlin/com/infendro/ddns/Main.kt index e92c772..0645597 100644 --- a/src/commonMain/kotlin/com/infendro/ddns/Main.kt +++ b/src/commonMain/kotlin/com/infendro/ddns/Main.kt @@ -3,7 +3,7 @@ package com.infendro.ddns import com.infendro.cli.argument.string import com.infendro.cli.argument.stringOrElse import com.infendro.cli.argument.strings -import com.infendro.cli.cli +import com.infendro.cli.command.cli import com.infendro.ddns.Argument.CONFIG import com.infendro.ddns.Argument.DOMAIN import com.infendro.ddns.Argument.IP_SERVICE diff --git a/src/commonMain/kotlin/com/infendro/ddns/argument/IpService.kt b/src/commonMain/kotlin/com/infendro/ddns/argument/IpService.kt index 6fbe3fe..f84d9e0 100644 --- a/src/commonMain/kotlin/com/infendro/ddns/argument/IpService.kt +++ b/src/commonMain/kotlin/com/infendro/ddns/argument/IpService.kt @@ -1,12 +1,11 @@ package com.infendro.ddns.argument -import com.infendro.cli.Command import com.infendro.cli.argument.Argument -import com.infendro.cli.argument.Parser +import com.infendro.cli.command.Command import com.infendro.ddns.ip.IpService import com.infendro.ddns.ip.IpServices -object IpServiceParser : Parser { +object IpServiceParser : Argument.Parser { override fun parse( text: String?, ): IpService {