Update dependencies (#34)

05nelsonm · web-flow · commit 6da314548172 · 2025-02-14T14:24:43.000-05:00
diff --git a/.kotlin-js-store/yarn.lock b/.kotlin-js-store/yarn.lock
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -15,8 +15,8 @@
  **/
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpTarget
 import kotlinx.benchmark.gradle.BenchmarksExtension
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 
@@ -27,7 +27,6 @@ plugins {
 kmpConfiguration {
     val benchmarks by lazy { extensions.getByType<BenchmarksExtension>() }
 
-    @OptIn(ExperimentalWasmDsl::class)
     configure {
         fun <T: KotlinTarget> KmpTarget<T>.register() {
             target { benchmarks.targets.register(name) }
@@ -36,6 +35,7 @@ kmpConfiguration {
         jvm { register() }
 
         js { target { browser(); nodejs() }; register() }
+        @OptIn(ExperimentalWasmDsl::class)
         wasmJs { target { browser(); nodejs() }; register() }
 
         val nativeHost = "nativeHost"
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -13,17 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
 import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 fun KmpConfigurationExtension.configureShared(
     java9ModuleName: String? = null,
     publish: Boolean = false,
-    action: Action<KmpConfigurationContainerDsl>
+    action: Action<KmpConfigurationContainerDsl>,
 ) {
     if (publish) {
         require(!java9ModuleName.isNullOrBlank()) { "publications must specify a module-info name" }
@@ -39,7 +38,6 @@ fun KmpConfigurationExtension.configureShared(
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
 
-            @OptIn(ExperimentalKmpConfigurationApi::class)
             java9ModuleInfoName = java9ModuleName
         }
 
@@ -74,7 +72,7 @@ fun KmpConfigurationExtension.configureShared(
         mingwAll()
 
         common {
-            if (publish) pluginIds("publication")
+            if (publish) pluginIds("publication", "dokka")
 
             sourceSetTest {
                 dependencies {
diff --git a/build-logic/src/main/kotlin/dokka.gradle.kts b/build-logic/src/main/kotlin/dokka.gradle.kts
@@ -13,33 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import org.jetbrains.dokka.DokkaConfiguration.Visibility
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.dokka.gradle.DokkaExtension
+import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
 import java.net.URI
 
 plugins {
     id("org.jetbrains.dokka")
 }
 
-tasks.withType<DokkaTaskPartial>().configureEach {
-    suppressInheritedMembers = true
+rootProject.dependencies { dokka(project(project.path)) }
+
+extensions.configure<DokkaExtension> {
+    dokkaPublications.configureEach {
+        suppressInheritedMembers.set(true)
+    }
 
     dokkaSourceSets.configureEach {
         includes.from("README.md")
-        noStdlibLink = true
+        enableKotlinStdLibDocumentationLink.set(false)
 
-        externalDocumentationLink {
-            url = URI("https://error.kotlincrypto.org/").toURL()
+        externalDocumentationLinks.create("error") {
+            url.set(URI("https://error.kotlincrypto.org/"))
         }
 
         sourceLink {
-            localDirectory = rootDir
-            remoteUrl = URI("https://github.com/KotlinCrypto/random/tree/master").toURL()
-            remoteLineSuffix = "#L"
+            localDirectory.set(rootDir)
+            remoteUrl.set(URI("https://github.com/KotlinCrypto/random/tree/master"))
+            remoteLineSuffix.set("#L")
         }
 
-        documentedVisibilities.set(setOf(
-            Visibility.PUBLIC,
-        ))
+        documentedVisibilities(
+            VisibilityModifier.Public,
+        )
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,16 @@ allprojects {
     findProperty("VERSION_NAME")?.let { version = it }
     findProperty("POM_DESCRIPTION")?.let { description = it.toString() }
 
-    repositories { mavenCentral() }
+    repositories {
+        mavenCentral()
+
+        if (version.toString().endsWith("-SNAPSHOT")) {
+            // Only allow snapshot dependencies for non-release versions.
+            // This would cause a build failure if attempting to make a release
+            // while depending on a -SNAPSHOT version (such as core).
+            maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+        }
+    }
 }
 
 @Suppress("PropertyName")
diff --git a/gh-pages/publish.sh b/gh-pages/publish.sh
@@ -26,8 +26,8 @@ echo "$REPO_NAME.kotlincrypto.org" > "$DIR_SCRIPT/$REPO_NAME/CNAME"
 
 cd ..
 ./gradlew clean -DKMP_TARGETS_ALL
-./gradlew dokkaHtmlMultiModule --no-build-cache -DKMP_TARGETS_ALL
-cp -aR build/dokka/htmlMultiModule/* gh-pages/$REPO_NAME
+./gradlew dokkaGenerate --no-build-cache -DKMP_TARGETS_ALL
+cp -aR build/dokka/html/* gh-pages/$REPO_NAME
 
 cd "$DIR_SCRIPT/$REPO_NAME"
 sed -i "s|module:|module:library/|g" "package-list"
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,9 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-gradle-benchmark            = "0.4.11"
-gradle-binary-compat        = "0.16.3"
-gradle-dokka                = "1.9.20"
-gradle-kmp-configuration    = "0.3.2"
-gradle-kotlin               = "1.9.24"
-gradle-publish-maven        = "0.29.0"
+gradle-benchmark            = "0.4.13"
+gradle-binary-compat        = "0.17.0"
+gradle-dokka                = "2.0.0"
+gradle-kmp-configuration    = "0.4.0"
+gradle-kotlin               = "2.1.10"
+gradle-publish-maven        = "0.30.0"
 
-kotlincrypto-error          = "0.2.0"
+kotlincrypto-error          = "0.3.0-SNAPSHOT"
 
 [libraries]
 gradle-dokka                = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,5 +4,5 @@ zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 
 # https://gradle.org/release-checksums/
-distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
diff --git a/library/crypto-rand/README.md b/library/crypto-rand/README.md
@@ -1,19 +1,17 @@
 # Module crypto-rand
 
-Obtain cryptographically secure random bytes from system sources.
+Procure cryptographically secure random data from system sources.
 
 ```kotlin
 fun main() {
     val bytes = try {
         CryptoRand.Default.nextBytes(ByteArray(16))
     } catch (e: RandomnessProcurementException) {
-        // Underlying platform APIs failed to procure data
-        // from system sources.
+        // Underlying platform API failed to procure data from system sources.
         e.printStackTrace()
         return
     }
 
     println(bytes.toList())
-    // 
 }
 ```
diff --git a/library/crypto-rand/build.gradle.kts b/library/crypto-rand/build.gradle.kts
@@ -20,8 +20,6 @@ plugins {
 kmpConfiguration {
     configureShared(java9ModuleName = "org.kotlincrypto.random", publish = true) {
         common {
-            pluginIds("dokka")
-
             sourceSetMain {
                 dependencies {
                     api(libs.kotlincrypto.error)
diff --git a/library/crypto-rand/src/commonMain/kotlin/org/kotlincrypto/random/CryptoRand.kt b/library/crypto-rand/src/commonMain/kotlin/org/kotlincrypto/random/CryptoRand.kt
@@ -21,27 +21,32 @@ import org.kotlincrypto.random.internal.cryptoRandFill
 
 /**
  * A source for obtaining random data from the system, suitable for use in cryptographic
- * operations and/or seeding random number generators (RNGs).
- *
- * e.g. (Seeding a Random Number Generator)
- *
- *     val rng = Random(
- *         seed = CryptoRand.Default.nextBytes(ByteArray(Long.SIZE_BYTES))
- *             // Using KotlinCrypto/bitops endian library
- *             // to convert 8 bytes to a Long
- *             .beLongAt(0)
- *     )
+ * operations and/or seeding of Pseudorandom Number Generators (PRNGs).
  *
  * @see [Default]
  * */
 public abstract class CryptoRand @DelicateCryptoRandApi protected constructor() {
 
+    /**
+     * Fills the provided [buf] array with securely generated random data, procured from system
+     * sources. If the underlying system has not collected enough entropy yet, this function
+     * may block.
+     *
+     * **NOTE:** [buf] is modified in place, whereby any [RandomnessProcurementException] thrown
+     * may leave [buf] partially filled. It **must** be discarded in that event.
+     *
+     * @param [buf] the array to fill
+     * @return [buf]
+     * @throws [RandomnessProcurementException] if the underlying API fails
+     * */
+    public abstract fun nextBytes(buf: ByteArray): ByteArray
+
     /**
      * The default implementation of [CryptoRand].
      *
      * The following APIs are used for procuring cryptographically secure random data:
-     *  - JVM: [java.security.SecureRandom](https://docs.oracle.com/javase/8/docs/api/java/security/SecureRandom.html)
-     *  - JS:
+     *  - Jvm: [java.security.SecureRandom](https://docs.oracle.com/javase/8/docs/api/java/security/SecureRandom.html)
+     *  - Js:
      *      - Browser: [Crypto.getRandomValues()](https://developer.mozilla.org/docs/Web/API/Crypto/getRandomValues)
      *      - Node: [Crypto.randomFillSync()](https://nodejs.org/api/crypto.html#cryptorandomfillsyncbuffer-offset-size)
      *  - WasmJs:
@@ -66,18 +71,4 @@ public abstract class CryptoRand @DelicateCryptoRandApi protected constructor()
         /** @suppress */
         public override fun toString(): String = "CryptoRand.Default"
     }
-
-    /**
-     * Fills the provided [buf] array with securely generated random data, procured from system
-     * sources. If the underlying system has not collected enough entropy yet, this function
-     * may block.
-     *
-     * **NOTE:** [buf] is modified in place, whereby any [RandomnessProcurementException] thrown
-     * may leave [buf] partially filled. It **must** be discarded in that event.
-     *
-     * @param [buf] the array to fill
-     * @return [buf]
-     * @throws [RandomnessProcurementException] if the underlying API fails
-     * */
-    public abstract fun nextBytes(buf: ByteArray): ByteArray
 }
diff --git a/library/crypto-rand/src/jsMain/kotlin/org/kotlincrypto/random/internal/JsPlatform.kt b/library/crypto-rand/src/jsMain/kotlin/org/kotlincrypto/random/internal/JsPlatform.kt
@@ -17,7 +17,6 @@
 
 package org.kotlincrypto.random.internal
 
-import org.khronos.webgl.Uint8Array
 import org.kotlincrypto.random.RandomnessProcurementException
 
 private const val BUFFER_SIZE = 1024 * 8
@@ -29,6 +28,10 @@ private external class Crypto {
     fun randomFillSync(buf: dynamic)
 }
 
+private open external class Uint8Array(length: Int) {
+    fun subarray(start: Int, end: Int): Uint8Array
+}
+
 private fun isNodeJs(): Boolean = js(
 """
 (typeof process !== 'undefined' 
diff --git a/library/crypto-rand/src/linuxTest/kotlin/org/kotlincrypto/random/CryptoRandURandomUnitTest.kt b/library/crypto-rand/src/linuxTest/kotlin/org/kotlincrypto/random/CryptoRandURandomUnitTest.kt
@@ -27,7 +27,7 @@ class CryptoRandURandomUnitTest: CryptoRandUnitTest() {
     @Test
     fun givenSystem_whenHasGetRandom_thenIsTrue() {
         // Should always be true, unless linux box running this test
-        // is rocking LIBC 3.16 or below... Which I don't even think
+        // is rocking GLIBC 2.24 or below... Which I don't even think
         // Kotlin would run on?
         //
         // This simply confirms that the CryptoRand.Default.nextBytes
diff --git a/library/crypto-rand/src/wasmJsMain/kotlin/org/kotlincrypto/random/internal/WasmJsPlatform.kt b/library/crypto-rand/src/wasmJsMain/kotlin/org/kotlincrypto/random/internal/WasmJsPlatform.kt
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-@file:Suppress("ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT")
+@file:Suppress("ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT", "KotlinRedundantDiagnosticSuppress")
 
 package org.kotlincrypto.random.internal
 
-import org.khronos.webgl.Uint8Array
-import org.khronos.webgl.get
-import org.khronos.webgl.set
 import org.kotlincrypto.random.RandomnessProcurementException
 
 private const val BUFFER_SIZE = 1024 * 8
@@ -31,6 +28,20 @@ private external class Crypto: JsAny {
     fun randomFillSync(buf: Uint8Array)
 }
 
+private open external class Uint8Array(length: Int) {
+    fun subarray(start: Int, end: Int): Uint8Array
+}
+
+@Suppress("UNUSED_PARAMETER")
+private fun uint8ArrayGet(obj: Uint8Array, index: Int): Byte { js("return obj[index];") }
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Uint8Array.get(index: Int): Byte = uint8ArrayGet(this, index)
+
+@Suppress("UNUSED_PARAMETER")
+private fun uint8ArraySet(obj: Uint8Array, index: Int, value: Byte) { js("obj[index] = value;") }
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Uint8Array.set(index: Int, value: Byte) { uint8ArraySet(this, index, value) }
+
 private fun isNodeJs(): Boolean = js(
 """
 (typeof process !== 'undefined' 
