Merge branch 'release/v0.2.5'

islands-wars · May 20, 2024 · 42d53e5 · 42d53e5
2 parents cb797fb + 6e8baee
commit 42d53e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,10 @@
 plugins {
     id("java")
     id("maven-publish")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 group = "fr.islandswars"
-version = "0.2.2"
+version = "0.2.5"
 
 repositories {
     mavenCentral()
@@ -30,21 +29,27 @@ tasks.withType<Jar> {
     }
 }
 
-tasks.shadowJar {
-    manifest {
-        attributes["Main-Class"] = "fr.islandswars.commons.Commons"
-    }
+val sourceJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(sourceSets.main.get().allSource)
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.javadoc.get().destinationDir)
 }
 
 publishing {
     publications {
         create<MavenPublication>("gpr") {
-            project.shadow.component(this)
-
+            from(components["java"])
             groupId = rootProject.group.toString()
             artifactId = rootProject.name
             version = version
 
+            artifact(sourceJar)
+            artifact(javadocJar)
+
             pom {
                 name.set(rootProject.name)
                 description.set("Utility classes for connecting to islands-wars database")

diff --git a/src/main/java/fr/islandswars/commons/network/nio/ByteBufferPool.java b/src/main/java/fr/islandswars/commons/network/nio/ByteBufferPool.java
@@ -135,10 +135,6 @@ class LocalCache {
         private final ArrayDeque<ByteBuffer> queue = new ArrayDeque<>();
         private       int                    outstanding;
 
-        protected void finalize() {
-            empty();
-        }
-
         void empty() {
             while (!queue.isEmpty()) {
                 masterQueue.add(queue.poll());