From 3ead2a6f8a4a4fd111fd7b9e7a4e0c7529493aba Mon Sep 17 00:00:00 2001
From: lesclaz <lesclaz95@gmail.com>
Date: Sun, 25 Feb 2024 13:12:11 -0500
Subject: [PATCH] various improvements

---
 build.gradle.kts | 54 ++++++++++++++++++++++++------
 pom_gradle.txt   | 86 ------------------------------------------------
 2 files changed, 44 insertions(+), 96 deletions(-)
 delete mode 100644 pom_gradle.txt

diff --git a/build.gradle.kts b/build.gradle.kts
index 7f792eb..be862ba 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,9 @@
+import cl.franciscosolis.sonatypecentralupload.SonatypeCentralUploadTask
+
 plugins {
     kotlin("jvm") version "1.9.22"
-    id("cl.franciscosolis.sonatype-central-upload") version "1.0.0"
+    `maven-publish`
+    id("cl.franciscosolis.sonatype-central-upload") version "1.0.2"
     id("com.google.devtools.ksp").version("1.9.22-1.0.17")
 }
 
@@ -40,21 +43,52 @@ kotlin {
     jvmToolchain(17)
 }
 
-sonatypeCentralUpload {
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            pom {
+                name.set(project.name)
+                description.set("A tool designed to interact with ETECSA services.")
+                url.set("http://github.com/suitetecsa/nauta-connect")
+                licenses {
+                    license {
+                        name.set("MIT License")
+                        url.set("http://github.com/suitetecsa/nauta-connect/blob/master/LICENSE")
+                        distribution.set("repo")
+                    }
+                }
+                developers {
+                    developer {
+                        id.set("lesclaz")
+                        name.set("Lesly Cintra")
+                        email.set("lesclaz95@gmail.com")
+                    }
+                }
+                scm {
+                    url.set("http://github.com/suitetecsa/nauta-connect/tree/master")
+                    connection.set("scm:git:git://github.com/suitetecsa/nauta-connect.git")
+                    developerConnection.set("scm:git:ssh://github.com/suitetecsa/nauta-connect.git")
+                }
+            }
+        }
+    }
+}
+
+tasks.named<SonatypeCentralUploadTask>("sonatypeCentralUpload") {
+    dependsOn("jar", "sourcesJar", "javadocJar", "generatePomFileForMavenPublication")
+
     username = System.getenv("SONATYPE_USERNAME")
     password = System.getenv("SONATYPE_PASSWORD")
 
     archives = files(
-        "build/libs/nauta-connect-${version}.jar",
-        "build/libs/nauta-connect-${version}-javadoc.jar",
-        "build/libs/nauta-connect-${version}-sources.jar"
+        tasks.named("jar"),
+        tasks.named("sourcesJar"),
+        tasks.named("javadocJar"),
+    )
+    pom = file(
+        tasks.named("generatePomFileForMavenPublication").get().outputs.files.single()
     )
-    pom = file("./pom_gradle.txt")
 
     signingKey = System.getenv("SIGNING_KEY")
     signingKeyPassphrase = System.getenv("SIGNING_KEY_PASSPHRASE")
 }
-
-tasks.sonatypeCentralUpload {
-    dependsOn("build")
-}
diff --git a/pom_gradle.txt b/pom_gradle.txt
deleted file mode 100644
index dd86350..0000000
--- a/pom_gradle.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.github.suitetecsa</groupId>
-    <artifactId>nauta-connect</artifactId>
-    <version>0.1.4-alpha01</version>
-    <packaging>jar</packaging>
-
-    <name>nauta-connect</name>
-    <description>A tool designed to interact with ETECSA services.</description>
-    <url>http://github.com/suitetecsa/nauta-connect</url>
-
-    <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>https://www.mit.edu/~amini/LICENSE.md</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Lesly Cintra</name>
-            <email>lesclaz95@gmail.com</email>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git://github.com/suitetecsa/nauta-connect.git</connection>
-        <developerConnection>scm:git:ssh://github.com:suitetecsa/nauta-connect.git</developerConnection>
-        <url>http://github.com/suitetecsa/nauta-connect/tree/master</url>
-    </scm>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>24.0.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>retrofit</artifactId>
-            <version>2.9.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>converter-moshi</artifactId>
-            <version>2.9.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.moshi</groupId>
-            <artifactId>moshi-kotlin</artifactId>
-            <version>1.15.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jakewharton.retrofit</groupId>
-            <artifactId>retrofit2-kotlin-coroutines-adapter</artifactId>
-            <version>0.9.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>adapter-rxjava3</artifactId>
-            <version>Introduce local variable</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.18.2</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>