From 1b5add5d4c319342e8fb1ba71e9c2d599e3231c1 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Fri, 5 Apr 2024 07:09:05 +0800 Subject: [PATCH] migrated to gitea --- build.gradle | 8 ++++---- gradle.properties | 6 +++--- settings.gradle | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 259ea25..772885e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ allprojects { repositories { maven { - url = woggioniMavenRepositoryUrl + url = getProperty('gitea.maven.url') } mavenCentral() } @@ -25,12 +25,12 @@ kotlin { dependencies { implementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', - version: catalog.versions.kotlin.get() + version: catalog.versions.kotlin.asProvider().get() } } } jvm { - jvmToolchain(17) + jvmToolchain(21) withJava() compilations.main { Action action = { KotlinJvmCompilerOptions kjco -> @@ -73,7 +73,7 @@ publishing { repositories { maven { name = "Gitea" - url = uri("https://woggioni.net/gitea/api/packages/woggioni/maven") + url = uri(getProperty('gitea.maven.url')) credentials(HttpHeaderCredentials) { name = "Authorization" diff --git a/gradle.properties b/gradle.properties index 2ca7cad..9388921 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.code.style=official kotlin.jvm.target.validation.mode=ignore -woggioniMavenRepositoryUrl=https://woggioni.net/mvn/ +gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven -klevtree.version = 2024.02.12 -lys.version = 2024.02.09 +klevtree.version = 2024.04.05 +lys.version = 2024.04.04 diff --git a/settings.gradle b/settings.gradle index 3b5de2b..4a674bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = woggioniMavenRepositoryUrl + url = getProperty('gitea.maven.url') } gradlePluginPortal() } @@ -10,7 +10,7 @@ pluginManagement { dependencyResolutionManagement { repositories { maven { - url = 'https://woggioni.net/mvn/' + url = getProperty('gitea.maven.url') content { includeGroup 'com.lys' } @@ -19,7 +19,6 @@ dependencyResolutionManagement { versionCatalogs { catalog { from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version') - version("slf4j", "1.7.36") } } }