From ae8643f1bd997d7895b2899ef59b631afa43a7e3 Mon Sep 17 00:00:00 2001 From: rnentjes Date: Sun, 27 Oct 2024 11:08:31 +0100 Subject: [PATCH] Version 1.1.2 --- build.gradle.kts | 52 ++++++------------- .../persistence/TestPersistenceJava.java | 4 +- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9e8ca1d..8c2ba1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,14 @@ import org.gradle.model.internal.core.ModelNodes.withType plugins { - kotlin("jvm") version "2.0.0" - id("maven-publish") - id("signing") + kotlin("jvm") version "2.0.21" + `maven-publish` + signing + id("org.jetbrains.dokka") version "1.5.31" } group = "nl.astraeus" -version = "1.1.2-SNAPSHOT" +version = "1.1.2" repositories { mavenCentral() @@ -32,14 +33,10 @@ extra["PUBLISH_ARTIFACT_ID"] = name val signingKeyId: String? by project val signingPassword: String? by project val signingSecretKeyRingFile: String? by project -val ossrhUsername: String? by project -val ossrhPassword: String? by project extra["signing.keyId"] = signingKeyId extra["signing.password"] = signingPassword extra["signing.secretKeyRingFile"] = signingSecretKeyRingFile -extra["ossrhUsername"] = ossrhUsername -extra["ossrhPassword"] = ossrhPassword val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") @@ -52,40 +49,20 @@ val sourcesJar by tasks.registering(Jar::class) { publishing { repositories { - mavenLocal() maven { - name = "releases" - // change to point to your repo, e.g. http://my.org/repo - setUrl("https://reposilite.astraeus.nl/releases") - credentials { - val reposiliteUsername: String? by project - val reposilitePassword: String? by project + name = "gitea" + setUrl("https://gitea.astraeus.nl/api/packages/rnentjes/maven") - username = reposiliteUsername - password = reposilitePassword - } - } - maven { - name = "snapshots" - // change to point to your repo, e.g. http://my.org/repo - setUrl("https://reposilite.astraeus.nl/snapshots") credentials { - val reposiliteUsername: String? by project - val reposilitePassword: String? by project + val giteaUsername: String? by project + val giteaPassword: String? by project - username = reposiliteUsername - password = reposilitePassword - } - } - maven { - name = "sonatype" - setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2") - credentials { - username = ossrhUsername - password = ossrhPassword + username = giteaUsername + password = giteaPassword } } } + publications { create("mavenKotlin") { artifact(javadocJar.get()) @@ -98,7 +75,6 @@ publishing { pom { name.set("simple-persistence-kotlin") description.set("Simple persistence in Kotlin") - //url.set("https://github.com/rnentjes/komponent") licenses { license { @@ -123,3 +99,7 @@ publishing { signing { sign(publishing.publications) } + +tasks.withType { + dependsOn(tasks.withType()) +} diff --git a/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java b/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java index f0e055c..85f7a4e 100644 --- a/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java +++ b/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java @@ -3,12 +3,14 @@ package nl.astraeus.persistence; import org.junit.jupiter.api.Test; import java.io.File; +import java.io.Serial; import java.util.List; public class TestPersistenceJava { static class Person extends AbstractPersistable { - private static Long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; private long id = 0; private long version = 0;