Skip to content

Commit d523e87

Browse files
05nelsonm05nelsonm
authored
Update dependencies (#166)
1 parent 69317fc commit d523e87

File tree

15 files changed

+312
-448
lines changed

15 files changed

+312
-448
lines changed

‎.gitignore

+1-77
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,9 @@
1-
# Built application files
2-
*.apk
3-
*.aar
4-
*.ap_
5-
*.aab
6-
7-
# Files for the ART/Dalvik VM
8-
*.dex
9-
10-
# Java class files
11-
*.class
12-
13-
# Generated files
14-
bin/
15-
gen/
16-
out/
17-
# Uncomment the following line in case you need and you don't have the release build type files in your app
18-
# release/
19-
20-
# Gradle files
211
.gradle/
222
build/
23-
24-
# Local configuration file (sdk path, etc)
25-
local.properties
26-
27-
# Proguard folder generated by Eclipse
28-
proguard/
29-
30-
# Log Files
31-
*.log
32-
33-
# Android Studio Navigation editor temp files
34-
.navigation/
35-
36-
# Android Studio captures folder
37-
captures/
38-
39-
# IntelliJ
403
*.iml
414
.idea/
5+
local.properties
426
.kotlin/
437

44-
# Android Studio 3 in .gitignore file.
45-
.idea/caches
46-
.idea/modules.xml
47-
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
48-
.idea/navEditor.xml
49-
50-
# Keystore files
51-
# Uncomment the following lines if you do not want to check your keystore files in.
52-
#*.jks
53-
#*.keystore
54-
55-
# External native build folder generated in Android Studio 2.2 and later
56-
.externalNativeBuild
57-
.cxx/
58-
59-
# Google Services (e.g. APIs or Firebase)
60-
# google-services.json
61-
62-
# Freeline
63-
freeline.py
64-
freeline/
65-
freeline_project_description.json
66-
67-
# fastlane
68-
fastlane/report.xml
69-
fastlane/Preview.html
70-
fastlane/screenshots
71-
fastlane/test_output
72-
fastlane/readme.md
73-
74-
# Version control
75-
vcs.xml
76-
77-
# lint
78-
lint/intermediates/
79-
lint/generated/
80-
lint/outputs/
81-
lint/tmp/
82-
# lint/reports/
83-
848
gh-pages/*
859
!gh-pages/publish.sh

‎.kotlin-js-store/yarn.lock

+219-272
Large diffs are not rendered by default.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ dependencies {
305305
[badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
306306

307307
<!-- TAG_DEPENDENCIES -->
308-
[badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.24-blue.svg?logo=kotlin
308+
[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin
309309

310310
<!-- TAG_PLATFORMS -->
311311
[badge-platform-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat

‎benchmarks/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.matthewnelson.kmp.configuration.extension.container.target.KmpTarget
1717
import kotlinx.benchmark.gradle.BenchmarksExtension
1818
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
19-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
19+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2020
import org.jetbrains.kotlin.konan.target.HostManager
2121
import org.jetbrains.kotlin.konan.target.KonanTarget
2222

‎bom/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/

‎build-logic/src/main/kotlin/-KmpConfigurationExtension.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
1716
import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
1817
import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
1918
import org.gradle.api.Action
2019
import org.gradle.api.JavaVersion
21-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
20+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2221

2322
fun KmpConfigurationExtension.configureShared(
2423
java9ModuleName: String? = null,
@@ -39,12 +38,10 @@ fun KmpConfigurationExtension.configureShared(
3938
compileSourceCompatibility = JavaVersion.VERSION_1_8
4039
compileTargetCompatibility = JavaVersion.VERSION_1_8
4140

42-
@OptIn(ExperimentalKmpConfigurationApi::class)
4341
java9ModuleInfoName = java9ModuleName
4442
}
4543

4644
js()
47-
4845
@OptIn(ExperimentalWasmDsl::class)
4946
wasmJs {
5047
target {
@@ -58,7 +55,6 @@ fun KmpConfigurationExtension.configureShared(
5855
nodejs()
5956
}
6057
}
61-
6258
@OptIn(ExperimentalWasmDsl::class)
6359
wasmWasi {
6460
target {

‎build-logic/src/main/kotlin/dokka.gradle.kts

+16-12
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,34 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import org.jetbrains.dokka.DokkaConfiguration.Visibility
17-
import org.jetbrains.dokka.gradle.DokkaTaskPartial
16+
import org.jetbrains.dokka.gradle.DokkaExtension
17+
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
1818
import java.net.URI
1919

2020
plugins {
2121
id("org.jetbrains.dokka")
2222
}
2323

24-
tasks.withType<DokkaTaskPartial>().configureEach {
25-
suppressInheritedMembers = true
24+
rootProject.dependencies { dokka(project(project.path)) }
25+
26+
extensions.configure<DokkaExtension> {
27+
dokkaPublications.configureEach {
28+
suppressInheritedMembers.set(true)
29+
}
2630

2731
dokkaSourceSets.configureEach {
2832
includes.from("README.md")
29-
noStdlibLink = true
33+
enableKotlinStdLibDocumentationLink.set(false)
3034

3135
sourceLink {
32-
localDirectory = rootDir
33-
remoteUrl = URI("https://github.com/05nelsonm/encoding/tree/master").toURL()
34-
remoteLineSuffix = "#L"
36+
localDirectory.set(rootDir)
37+
remoteUrl.set(URI("https://github.com/05nelsonm/encoding/tree/master"))
38+
remoteLineSuffix.set("#L")
3539
}
3640

37-
documentedVisibilities.set(setOf(
38-
Visibility.PUBLIC,
39-
Visibility.PROTECTED,
40-
))
41+
documentedVisibilities(
42+
VisibilityModifier.Public,
43+
VisibilityModifier.Protected,
44+
)
4145
}
4246
}

‎gh-pages/publish.sh

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
set -e
1616

1717
readonly DIR_SCRIPT="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
18+
readonly REPO_NAME="encoding"
1819

19-
trap 'rm -rf "$DIR_SCRIPT/encoding"' EXIT
20+
trap 'rm -rf "$DIR_SCRIPT/$REPO_NAME"' EXIT
2021

2122
cd "$DIR_SCRIPT"
22-
git clone -b gh-pages --single-branch https://github.com/05nelsonm/encoding.git
23-
rm -rf "$DIR_SCRIPT/encoding/"*
24-
echo "encoding.matthewnelson.io" > "$DIR_SCRIPT/encoding/CNAME"
23+
git clone -b gh-pages --single-branch https://github.com/05nelsonm/$REPO_NAME.git
24+
rm -rf "$DIR_SCRIPT/$REPO_NAME/"*
25+
echo "$REPO_NAME.matthewnelson.io" > "$DIR_SCRIPT/$REPO_NAME/CNAME"
2526

2627
cd ..
2728
./gradlew clean -DKMP_TARGETS_ALL
28-
./gradlew dokkaHtmlMultiModule --no-build-cache -DKMP_TARGETS_ALL
29-
cp -aR build/dokka/htmlMultiModule/* gh-pages/encoding
29+
./gradlew dokkaGenerate --no-build-cache -DKMP_TARGETS_ALL
30+
cp -aR build/dokka/html/* gh-pages/$REPO_NAME
3031

31-
cd "$DIR_SCRIPT/encoding"
32+
cd "$DIR_SCRIPT/$REPO_NAME"
3233
sed -i "s|module:|module:library/|g" "package-list"
3334

3435
git add --all

‎gradle.properties

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
org.gradle.parallel=true
33
org.gradle.caching=true
44

5+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
6+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
7+
58
kotlin.code.style=official
69
kotlin.mpp.applyDefaultHierarchyTemplate=false
710
kotlin.mpp.stability.nowarn=true
@@ -27,10 +30,10 @@ POM_DEVELOPER_ID=05nelsonm
2730
POM_DEVELOPER_NAME=Matthew Nelson
2831
POM_DEVELOPER_URL=https://github.com/05nelsonm/
2932

30-
VERSION_NAME=2.3.2-SNAPSHOT
33+
VERSION_NAME=2.4.0-SNAPSHOT
3134
# 0.1.0-alpha01 = 00 01 00 11
3235
# 0.1.0-beta01 = 00 01 00 21
3336
# 0.1.0-rc01 = 00 01 00 31
3437
# 0.1.0 = 00 01 00 99
3538
# 1.1.0 = 01 01 00 99
36-
VERSION_CODE=02030299
39+
VERSION_CODE=02040099

‎gradle/libs.versions.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
[versions]
2-
gradle-benchmark = "0.4.11"
3-
gradle-binary-compat = "0.16.3"
4-
gradle-dokka = "1.9.20"
5-
gradle-kmp-configuration = "0.3.2"
6-
gradle-kotlin = "1.9.24"
7-
gradle-publish-maven = "0.29.0"
2+
gradle-benchmark = "0.4.13"
3+
gradle-binary-compat = "0.17.0"
4+
gradle-dokka = "2.0.0"
5+
gradle-kmp-configuration = "0.4.0"
6+
gradle-kotlin = "2.1.10"
7+
gradle-publish-maven = "0.30.0"
88

99
[libraries]
10-
benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }
10+
benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }
1111

12-
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
13-
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
14-
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
15-
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
12+
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
13+
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
14+
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
15+
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
1616

1717
[plugins]
18-
benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
19-
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
20-
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
21-
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
18+
benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
19+
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
20+
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
21+
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ zipStorePath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55

66
# https://gradle.org/release-checksums/
7-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
8-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
7+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
8+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip

‎library/base16/api/base16.klib.api

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class io.matthewnelson.encoding.base16/Base16 : io.matthewnelson.encoding.
1212
final class Config : io.matthewnelson.encoding.core/EncoderDecoder.Config { // io.matthewnelson.encoding.base16/Base16.Config|null[0]
1313
final val encodeToLowercase // io.matthewnelson.encoding.base16/Base16.Config.encodeToLowercase|{}encodeToLowercase[0]
1414
final fun <get-encodeToLowercase>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16.Config.encodeToLowercase.<get-encodeToLowercase>|<get-encodeToLowercase>(){}[0]
15-
final val isConstantTime // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime|<get-isConstantTime>(){}[0]
15+
final val isConstantTime // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime|{}isConstantTime[0]
1616
final fun <get-isConstantTime>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16.Config.isConstantTime.<get-isConstantTime>|<get-isConstantTime>(){}[0]
1717
}
1818

@@ -28,16 +28,16 @@ final class io.matthewnelson.encoding.base16/Base16ConfigBuilder { // io.matthew
2828
constructor <init>() // io.matthewnelson.encoding.base16/Base16ConfigBuilder.<init>|<init>(){}[0]
2929
constructor <init>(io.matthewnelson.encoding.base16/Base16.Config?) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.<init>|<init>(io.matthewnelson.encoding.base16.Base16.Config?){}[0]
3030

31-
final var encodeToLowercase // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase|<set-encodeToLowercase>(kotlin.Boolean){}[0]
31+
final var encodeToLowercase // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase|{}encodeToLowercase[0]
3232
final fun <get-encodeToLowercase>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase.<get-encodeToLowercase>|<get-encodeToLowercase>(){}[0]
3333
final fun <set-encodeToLowercase>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.encodeToLowercase.<set-encodeToLowercase>|<set-encodeToLowercase>(kotlin.Boolean){}[0]
3434
final var isConstantTime // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime|{}isConstantTime[0]
3535
final fun <get-isConstantTime>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime.<get-isConstantTime>|<get-isConstantTime>(){}[0]
3636
final fun <set-isConstantTime>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isConstantTime.<set-isConstantTime>|<set-isConstantTime>(kotlin.Boolean){}[0]
37-
final var isLenient // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient|<set-isLenient>(kotlin.Boolean){}[0]
37+
final var isLenient // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient|{}isLenient[0]
3838
final fun <get-isLenient>(): kotlin/Boolean // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient.<get-isLenient>|<get-isLenient>(){}[0]
3939
final fun <set-isLenient>(kotlin/Boolean) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.isLenient.<set-isLenient>|<set-isLenient>(kotlin.Boolean){}[0]
40-
final var lineBreakInterval // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval|<set-lineBreakInterval>(kotlin.Byte){}[0]
40+
final var lineBreakInterval // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval|{}lineBreakInterval[0]
4141
final fun <get-lineBreakInterval>(): kotlin/Byte // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval.<get-lineBreakInterval>|<get-lineBreakInterval>(){}[0]
4242
final fun <set-lineBreakInterval>(kotlin/Byte) // io.matthewnelson.encoding.base16/Base16ConfigBuilder.lineBreakInterval.<set-lineBreakInterval>|<set-lineBreakInterval>(kotlin.Byte){}[0]
4343

@@ -48,7 +48,7 @@ final class io.matthewnelson.encoding.base16/Base16ConfigBuilder { // io.matthew
4848
final fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16ToByteArray(): kotlin/ByteArray // io.matthewnelson.component.encoding.base16/encodeBase16ToByteArray|[email protected](){}[0]
4949
final fun (kotlin/CharArray).io.matthewnelson.component.encoding.base16/decodeBase16ToArray(): kotlin/ByteArray? // io.matthewnelson.component.encoding.base16/decodeBase16ToArray|[email protected](){}[0]
5050
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]
51-
final fun io.matthewnelson.encoding.base16/Base16(kotlin/Boolean =...): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(kotlin.Boolean){}[0]
51+
final fun io.matthewnelson.encoding.base16/Base16(kotlin/Boolean = ...): io.matthewnelson.encoding.base16/Base16 // io.matthewnelson.encoding.base16/Base16|Base16(kotlin.Boolean){}[0]
5252
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]
5353
final inline fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16(): kotlin/String // io.matthewnelson.component.encoding.base16/encodeBase16|[email protected](){}[0]
5454
final inline fun (kotlin/ByteArray).io.matthewnelson.component.encoding.base16/encodeBase16ToCharArray(): kotlin/CharArray // io.matthewnelson.component.encoding.base16/encodeBase16ToCharArray|[email protected](){}[0]

0 commit comments

Comments
 (0)