From 2c6263f691551036f7942a73d2c8e5a4adb45c36 Mon Sep 17 00:00:00 2001
From: Ron Lauren Hombre <118486316+ronhombre@users.noreply.github.com>
Date: Sat, 10 Feb 2024 14:18:30 +0800
Subject: [PATCH] KyberKotlin v0.4.6 * Fixed duplicate dependencies for
 dependents. * jvmFullJar

---
 build.gradle.kts                                | 17 +++++++++++------
 pom.xml                                         |  4 ++--
 .../kotlin/asia/hombre/kyber/Tests.kt           | 12 ++++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c2636df..97469e6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "asia.hombre.kyber" //The value after the last '.' is considered the maven name i.e. asia.hombre:kyber:+
-version = "0.4.5"
+version = "0.4.6"
 
 val projectName = project.group.toString().split(".").last() //Grab maven name
 val baseProjectName = projectName.plus("-").plus(project.version)
@@ -22,6 +22,7 @@ val mavenBundlingDir = "$mavenDir/bundling"
 val mavenDeep = "$mavenBundlingDir/" + (project.group.toString().replace(".", "/")) + "/" + version
 
 val jarFileName = baseProjectName.plus(".jar")
+val jarFullFileName = baseProjectName.plus("-full.jar")
 val pomFileName = baseProjectName.plus(".pom")
 val javadocsFileName = baseProjectName.plus("-javadoc.jar")
 val sourcesFileName = baseProjectName.plus("-sources.jar")
@@ -102,15 +103,19 @@ kotlin {
             archiveFileName.set(mavenBundleFileName)
         }
 
-        val jvmJar by tasks.getting(org.gradle.jvm.tasks.Jar::class) {
+        tasks.register<Jar>("jvmFullJar") {
             archiveFileName.set(jarFileName)
 
+            doFirst {
+                from(sourceSets["jvmMain"].kotlin)
+            }
+        }
+
+        val jvmFullJar by tasks.getting(org.gradle.jvm.tasks.Jar::class) {
+            archiveFileName.set(jarFullFileName)
+
             doFirst {
                 from(configurations.getByName("jvmRuntimeClasspath").map { if (it.isDirectory) it else zipTree(it) })
-                //Uncomment to list jvm configurations
-                /*println(configurations.names.toList().filter {
-                    it.contains("jvm") &&!(it.contains("test") || it.contains("Test"))
-                }.joinToString("\n"))*/
             }
         }
 
diff --git a/pom.xml b/pom.xml
index 4614481..b8299fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,11 @@
 
     <groupId>asia.hombre</groupId>
     <artifactId>kyber</artifactId>
-    <version>0.4.5</version>
+    <version>0.4.6</version>
     <packaging>jar</packaging>
 
     <scm>
-        <tag>v0.4.5</tag>
+        <tag>v0.4.6</tag>
         <connection>scm:git:https://github.com/ronhombre/KyberKotlin.git</connection>
         <url>https://github.com/ronhombre/KyberKotlin.git</url>
     </scm>
diff --git a/src/commonTest/kotlin/asia/hombre/kyber/Tests.kt b/src/commonTest/kotlin/asia/hombre/kyber/Tests.kt
index 6a82ba5..ed78051 100644
--- a/src/commonTest/kotlin/asia/hombre/kyber/Tests.kt
+++ b/src/commonTest/kotlin/asia/hombre/kyber/Tests.kt
@@ -339,8 +339,8 @@ class Tests {
         val randomSeed = SecureRandom().nextBytesOf(32)
         val pkeSeed = SecureRandom().nextBytesOf(32)
 
-        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_512, randomSeed, pkeSeed)
-        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_512, randomSeed, pkeSeed)
+        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_512, randomSeed, pkeSeed.copyOf())
+        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_512, randomSeed, pkeSeed.copyOf())
 
         assertContentEquals(firstGeneration.encapsulationKey.key.fullBytes, secondGeneration.encapsulationKey.key.fullBytes, "Regeneration failed for 512!")
     }
@@ -350,8 +350,8 @@ class Tests {
         val randomSeed = SecureRandom().nextBytesOf(32)
         val pkeSeed = SecureRandom().nextBytesOf(32)
 
-        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_768, randomSeed, pkeSeed)
-        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_768, randomSeed, pkeSeed)
+        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_768, randomSeed, pkeSeed.copyOf())
+        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_768, randomSeed, pkeSeed.copyOf())
 
         assertContentEquals(firstGeneration.encapsulationKey.key.fullBytes, secondGeneration.encapsulationKey.key.fullBytes, "Regeneration failed for 768!")
     }
@@ -361,8 +361,8 @@ class Tests {
         val randomSeed = SecureRandom().nextBytesOf(32)
         val pkeSeed = SecureRandom().nextBytesOf(32)
 
-        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_1024, randomSeed, pkeSeed)
-        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_1024, randomSeed, pkeSeed)
+        val firstGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_1024, randomSeed, pkeSeed.copyOf())
+        val secondGeneration = KyberKeyGenerator.generate(KyberParameter.ML_KEM_1024, randomSeed, pkeSeed.copyOf())
 
         assertContentEquals(firstGeneration.encapsulationKey.key.fullBytes, secondGeneration.encapsulationKey.key.fullBytes, "Regeneration failed for 1024!")
     }