Update dependencies (#166)

05nelsonm · Feb 10, 2025 · d523e87 · d523e87
1 parent 69317fc
commit d523e87
Show file tree

Hide file tree

Showing 15 changed files with 312 additions and 448 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,85 +1,9 @@
-# Built application files
-*.apk
-*.aar
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-#  Uncomment the following line in case you need and you don't have the release build type files in your app
-# release/
-
-# Gradle files
 .gradle/
 build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
 *.iml
 .idea/
+local.properties
 .kotlin/
 
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
-
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-.cxx/
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
-# Version control
-vcs.xml
-
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-# lint/reports/
-
 gh-pages/*
 !gh-pages/publish.sh
diff --git a/.kotlin-js-store/yarn.lock b/.kotlin-js-store/yarn.lock
diff --git a/README.md b/README.md
@@ -305,7 +305,7 @@ dependencies {
 [badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
 
 <!-- TAG_DEPENDENCIES -->
-[badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.24-blue.svg?logo=kotlin
+[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin
 
 <!-- TAG_PLATFORMS -->
 [badge-platform-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -16,7 +16,7 @@
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpTarget
 import kotlinx.benchmark.gradle.BenchmarksExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 

diff --git a/bom/.gitignore b/bom/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -13,12 +13,11 @@
  * 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,
@@ -39,12 +38,10 @@ fun KmpConfigurationExtension.configureShared(
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
 
-            @OptIn(ExperimentalKmpConfigurationApi::class)
             java9ModuleInfoName = java9ModuleName
         }
 
         js()
-
         @OptIn(ExperimentalWasmDsl::class)
         wasmJs {
             target {
@@ -58,7 +55,6 @@ fun KmpConfigurationExtension.configureShared(
                 nodejs()
             }
         }
-
         @OptIn(ExperimentalWasmDsl::class)
         wasmWasi {
             target {

diff --git a/build-logic/src/main/kotlin/dokka.gradle.kts b/build-logic/src/main/kotlin/dokka.gradle.kts
@@ -13,30 +13,34 @@
  * 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)
 
         sourceLink {
-            localDirectory = rootDir
-            remoteUrl = URI("https://github.com/05nelsonm/encoding/tree/master").toURL()
-            remoteLineSuffix = "#L"
+            localDirectory.set(rootDir)
+            remoteUrl.set(URI("https://github.com/05nelsonm/encoding/tree/master"))
+            remoteLineSuffix.set("#L")
         }
 
-        documentedVisibilities.set(setOf(
-            Visibility.PUBLIC,
-            Visibility.PROTECTED,
-        ))
+        documentedVisibilities(
+            VisibilityModifier.Public,
+            VisibilityModifier.Protected,
+        )
     }
 }
diff --git a/gh-pages/publish.sh b/gh-pages/publish.sh
@@ -15,20 +15,21 @@
 set -e
 
 readonly DIR_SCRIPT="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
+readonly REPO_NAME="encoding"
 
-trap 'rm -rf "$DIR_SCRIPT/encoding"' EXIT
+trap 'rm -rf "$DIR_SCRIPT/$REPO_NAME"' EXIT
 
 cd "$DIR_SCRIPT"
-git clone -b gh-pages --single-branch https://github.com/05nelsonm/encoding.git
-rm -rf "$DIR_SCRIPT/encoding/"*
-echo "encoding.matthewnelson.io" > "$DIR_SCRIPT/encoding/CNAME"
+git clone -b gh-pages --single-branch https://github.com/05nelsonm/$REPO_NAME.git
+rm -rf "$DIR_SCRIPT/$REPO_NAME/"*
+echo "$REPO_NAME.matthewnelson.io" > "$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/encoding
+./gradlew dokkaGenerate --no-build-cache -DKMP_TARGETS_ALL
+cp -aR build/dokka/html/* gh-pages/$REPO_NAME
 
-cd "$DIR_SCRIPT/encoding"
+cd "$DIR_SCRIPT/$REPO_NAME"
 sed -i "s|module:|module:library/|g" "package-list"
 
 git add --all

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 kotlin.code.style=official
 kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.stability.nowarn=true
@@ -27,10 +30,10 @@ POM_DEVELOPER_ID=05nelsonm
 POM_DEVELOPER_NAME=Matthew Nelson
 POM_DEVELOPER_URL=https://github.com/05nelsonm/
 
-VERSION_NAME=2.3.2-SNAPSHOT
+VERSION_NAME=2.4.0-SNAPSHOT
 # 0.1.0-alpha01 = 00 01 00 11
 # 0.1.0-beta01  = 00 01 00 21
 # 0.1.0-rc01    = 00 01 00 31
 # 0.1.0         = 00 01 00 99
 # 1.1.0         = 01 01 00 99
-VERSION_CODE=02030299
+VERSION_CODE=02040099
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [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"
 
 [libraries]
-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }
+benchmark-runtime           = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }
 
-gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
-gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
-gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
-gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
+gradle-dokka                = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
+gradle-kmp-configuration    = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
+gradle-kotlin               = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
+gradle-publish-maven        = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
 
 [plugins]
-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
-binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
+benchmark                   = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
+binary-compat               = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
+dokka                       = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
+multiplatform               = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
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/base16/api/base16.klib.api b/library/base16/api/base16.klib.api
@@ -12,7 +12,7 @@ final class io.matthewnelson.encoding.base16/Base16 : io.matthewnelson.encoding.
     final class Config : io.matthewnelson.encoding.core/EncoderDecoder.Config { // io.matthewnelson.encoding.base16/Base16.Config|null[0]
         final val encodeToLowercase // io.matthewnelson.encoding.base16/Base16.Config.encodeToLowercase|{}encodeToLowercase[0]
             final fun <get-encodeToLowercase>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16.Config.encodeToLowercase.<get-encodeToLowercase>|<get-encodeToLowercase>(){}[0]
-        final val isConstantTime // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime|<get-isConstantTime>(){}[0]
+        final val isConstantTime // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime|{}isConstantTime[0]
             final fun <get-isConstantTime>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime.<get-isConstantTime>|<get-isConstantTime>(){}[0]
     }
 
@@ -28,16 +28,16 @@ final class io.matthewnelson.encoding.base16/Base16ConfigBuilder { // io.matthew
     constructor <init>() // io.matthewnelson.encoding.base16/Base16ConfigBuilder.<init>|<init>(){}[0]
     constructor <init>(io.matthewnelson.encoding.base16/Base16.Config?) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.<init>|<init>(io.matthewnelson.encoding.base16.Base16.Config?){}[0]
 
-    final var encodeToLowercase // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase|<set-encodeToLowercase>(kotlin.Boolean){}[0]
+    final var encodeToLowercase // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase|{}encodeToLowercase[0]
         final fun <get-encodeToLowercase>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase.<get-encodeToLowercase>|<get-encodeToLowercase>(){}[0]
         final fun <set-encodeToLowercase>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase.<set-encodeToLowercase>|<set-encodeToLowercase>(kotlin.Boolean){}[0]
     final var isConstantTime // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime|{}isConstantTime[0]
         final fun <get-isConstantTime>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime.<get-isConstantTime>|<get-isConstantTime>(){}[0]
         final fun <set-isConstantTime>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime.<set-isConstantTime>|<set-isConstantTime>(kotlin.Boolean){}[0]
-    final var isLenient // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient|<set-isLenient>(kotlin.Boolean){}[0]
+    final var isLenient // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient|{}isLenient[0]
         final fun <get-isLenient>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient.<get-isLenient>|<get-isLenient>(){}[0]
         final fun <set-isLenient>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient.<set-isLenient>|<set-isLenient>(kotlin.Boolean){}[0]
-    final var lineBreakInterval // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval|<set-lineBreakInterval>(kotlin.Byte){}[0]
+    final var lineBreakInterval // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval|{}lineBreakInterval[0]
         final fun <get-lineBreakInterval>(): kotlin/Byte // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval.<get-lineBreakInterval>|<get-lineBreakInterval>(){}[0]
         final fun <set-lineBreakInterval>(kotlin/Byte) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval.<set-lineBreakInterval>|<set-lineBreakInterval>(kotlin.Byte){}[0]
 
@@ -48,7 +48,7 @@ final class io.matthewnelson.encoding.base16/Base16ConfigBuilder { // io.matthew
 final fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16ToByteArray(): kotlin/ByteArray // io.matthewnelson.component.encoding.base16/encodeBase16ToByteArray|encodeBase16ToByteArray@kotlin.ByteArray(){}[0]
 final fun (kotlin/CharArray).io.matthewnelson.component.encoding.base16/decodeBase16ToArray(): kotlin/ByteArray? // io.matthewnelson.component.encoding.base16/decodeBase16ToArray|decodeBase16ToArray@kotlin.CharArray(){}[0]
 final fun io.matthewnelson.encoding.base16/Base16(io.matthewnelson.encoding.base16/Base16.Config?, kotlin/Function1<io.matthewnelson.encoding.base16/Base16ConfigBuilder, kotlin/Unit>): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(io.matthewnelson.encoding.base16.Base16.Config?;kotlin.Function1<io.matthewnelson.encoding.base16.Base16ConfigBuilder,kotlin.Unit>){}[0]
-final fun io.matthewnelson.encoding.base16/Base16(kotlin/Boolean =...): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(kotlin.Boolean){}[0]
+final fun io.matthewnelson.encoding.base16/Base16(kotlin/Boolean = ...): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(kotlin.Boolean){}[0]
 final fun io.matthewnelson.encoding.base16/Base16(kotlin/Function1<io.matthewnelson.encoding.base16/Base16ConfigBuilder, kotlin/Unit>): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(kotlin.Function1<io.matthewnelson.encoding.base16.Base16ConfigBuilder,kotlin.Unit>){}[0]
 final inline fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16(): kotlin/String // io.matthewnelson.component.encoding.base16/encodeBase16|encodeBase16@kotlin.ByteArray(){}[0]
 final inline fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16ToCharArray(): kotlin/CharArray // io.matthewnelson.component.encoding.base16/encodeBase16ToCharArray|encodeBase16ToCharArray@kotlin.ByteArray(){}[0]