Skip to content

Commit cccb2c0

Browse files
authored
Update dependencies (#122)
1 parent c2463f3 commit cccb2c0

File tree

12 files changed

+251
-307
lines changed

12 files changed

+251
-307
lines changed

.kotlin-js-store/yarn.lock

+222-275
Large diffs are not rendered by default.

benchmarks/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
**/
1616
import io.matthewnelson.kmp.configuration.extension.container.target.KmpTarget
1717
import kotlinx.benchmark.gradle.BenchmarksExtension
18+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
1819
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
19-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2020
import org.jetbrains.kotlin.konan.target.HostManager
2121
import org.jetbrains.kotlin.konan.target.KonanTarget
2222

@@ -27,7 +27,6 @@ plugins {
2727
kmpConfiguration {
2828
val benchmarks by lazy { extensions.getByType<BenchmarksExtension>() }
2929

30-
@OptIn(ExperimentalWasmDsl::class)
3130
configure {
3231
fun <T: KotlinTarget> KmpTarget<T>.register() {
3332
target { benchmarks.targets.register(name) }
@@ -36,6 +35,7 @@ kmpConfiguration {
3635
jvm { register() }
3736

3837
js { target { browser(); nodejs() }; register() }
38+
@OptIn(ExperimentalWasmDsl::class)
3939
wasmJs { target { browser(); nodejs() }; register() }
4040

4141
val nativeHost = "nativeHost"

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,20 +38,17 @@ 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 {
5148
browser()
5249
nodejs()
5350
}
5451
}
55-
5652
@OptIn(ExperimentalWasmDsl::class)
5753
wasmWasi {
5854
target {

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
id("org.jetbrains.dokka")
2222
}
2323

24+
// TODO: Update to Dokka 2.0.0 (Issue #121)
2425
tasks.withType<DokkaTaskPartial>().configureEach {
2526
suppressInheritedMembers = true
2627

build.gradle.kts

+10-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,16 @@ allprojects {
3030
findProperty("VERSION_NAME")?.let { version = it }
3131
findProperty("POM_DESCRIPTION")?.let { description = it.toString() }
3232

33-
repositories { mavenCentral() }
33+
repositories {
34+
mavenCentral()
35+
36+
if (version.toString().endsWith("-SNAPSHOT")) {
37+
// Only allow snapshot dependencies for non-release versions.
38+
// This would cause a build failure if attempting to make a release
39+
// while depending on a -SNAPSHOT version (such as core).
40+
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
41+
}
42+
}
3443
}
3544

3645
@Suppress("PropertyName")
@@ -44,8 +53,6 @@ plugins.withType<YarnPlugin> {
4453
}
4554

4655
apiValidation {
47-
// Only enable when selectively enabled targets are not being passed via cli.
48-
// See https://github.com/Kotlin/binary-compatibility-validator/issues/269
4956
@OptIn(kotlinx.validation.ExperimentalBCVApi::class)
5057
klib.enabled = findProperty("KMP_TARGETS") == null
5158

gradle/libs.versions.toml

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[versions]
2-
androidx-test-runner = "1.5.2"
2+
#noinspection GradleDependency
3+
androidx-test-runner = "1.5.2" # Do not upgrade. Tests run for API 15+, where next version requires minSdk 19+
34

4-
gradle-benchmark = "0.4.11"
5-
gradle-android = "8.2.2"
6-
gradle-binary-compat = "0.16.3"
5+
gradle-benchmark = "0.4.13"
6+
gradle-android = "8.7.3"
7+
gradle-binary-compat = "0.17.0"
78
gradle-dokka = "1.9.20"
8-
gradle-kmp-configuration = "0.3.2"
9-
gradle-kotlin = "1.9.24"
10-
gradle-publish-maven = "0.29.0"
9+
gradle-kmp-configuration = "0.4.0"
10+
gradle-kotlin = "2.1.10"
11+
gradle-publish-maven = "0.30.0"
1112

12-
kotlincrypto-error = "0.2.0"
13+
kotlincrypto-error = "0.3.0-SNAPSHOT"
1314

1415
[libraries]
1516
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }

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/digest/api/digest.klib.api

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@ abstract class org.kotlincrypto.core.digest/Digest : org.kotlincrypto.core/Algor
3131
open fun updateProtected(kotlin/ByteArray, kotlin/Int, kotlin/Int) // org.kotlincrypto.core.digest/Digest.updateProtected|updateProtected(kotlin.ByteArray;kotlin.Int;kotlin.Int){}[0]
3232
}
3333

34-
sealed class org.kotlincrypto.core.digest.internal/DigestState { // org.kotlincrypto.core.digest.internal/DigestState|null[0]
35-
constructor <init>() // org.kotlincrypto.core.digest.internal/DigestState.<init>|<init>(){}[0]
36-
}
34+
sealed class org.kotlincrypto.core.digest.internal/DigestState // org.kotlincrypto.core.digest.internal/DigestState|null[0]

library/mac/api/mac.klib.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class org.kotlincrypto.core.mac/Mac : org.kotlincrypto.core/Algorithm,
3030
constructor <init>(kotlin/ByteArray, kotlin/Boolean) // org.kotlincrypto.core.mac/Mac.Engine.<init>|<init>(kotlin.ByteArray;kotlin.Boolean){}[0]
3131
constructor <init>(org.kotlincrypto.core.mac/Mac.Engine) // org.kotlincrypto.core.mac/Mac.Engine.<init>|<init>(org.kotlincrypto.core.mac.Mac.Engine){}[0]
3232

33-
final val resetOnDoFinal // org.kotlincrypto.core.mac/Mac.Engine.resetOnDoFinal|<get-resetOnDoFinal>(){}[0]
33+
final val resetOnDoFinal // org.kotlincrypto.core.mac/Mac.Engine.resetOnDoFinal|{}resetOnDoFinal[0]
3434
final fun <get-resetOnDoFinal>(): kotlin/Boolean // org.kotlincrypto.core.mac/Mac.Engine.resetOnDoFinal.<get-resetOnDoFinal>|<get-resetOnDoFinal>(){}[0]
3535

3636
abstract fun doFinal(): kotlin/ByteArray // org.kotlincrypto.core.mac/Mac.Engine.doFinal|doFinal(){}[0]

library/mac/src/commonMain/kotlin/org/kotlincrypto/core/mac/Mac.kt

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package org.kotlincrypto.core.mac
1919

2020
import org.kotlincrypto.core.*
2121
import org.kotlincrypto.error.ShortBufferException
22-
import kotlin.jvm.JvmField
2322

2423
/**
2524
* Core abstraction for Message Authentication Code implementations.
@@ -153,7 +152,6 @@ public expect abstract class Mac: Algorithm, Copyable<Mac>, Resettable, Updatabl
153152
* taken in their [Engine.reset] function body are executed before their [doFinal]
154153
* and [doFinalInto] implementations return.
155154
* */
156-
@JvmField
157155
public val resetOnDoFinal: Boolean
158156

159157
/**

library/mac/src/nonJvmMain/kotlin/org/kotlincrypto/core/mac/Mac.kt

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package org.kotlincrypto.core.mac
2020
import org.kotlincrypto.core.*
2121
import org.kotlincrypto.core.mac.internal.*
2222
import org.kotlincrypto.error.ShortBufferException
23-
import kotlin.jvm.JvmField
2423

2524
/**
2625
* Core abstraction for Message Authentication Code implementations.
@@ -185,7 +184,6 @@ public actual abstract class Mac: Algorithm, Copyable<Mac>, Resettable, Updatabl
185184
* taken in their [Engine.reset] function body are executed before their [doFinal]
186185
* and [doFinalInto] implementations return.
187186
* */
188-
@JvmField
189187
public actual val resetOnDoFinal: Boolean
190188

191189
/**

library/xof/api/xof.klib.api

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ abstract class <#A: org.kotlincrypto.core.xof/XofAlgorithm> org.kotlincrypto.cor
3131
}
3232

3333
sealed class <#A: org.kotlincrypto.core.xof/XofAlgorithm> org.kotlincrypto.core.xof/Xof : org.kotlincrypto.core/Algorithm, org.kotlincrypto.core/Copyable<org.kotlincrypto.core.xof/Xof<#A>>, org.kotlincrypto.core/Resettable, org.kotlincrypto.core/Updatable { // org.kotlincrypto.core.xof/Xof|null[0]
34-
constructor <init>(#A) // org.kotlincrypto.core.xof/Xof.<init>|<init>(1:0){}[0]
35-
3634
final val delegate // org.kotlincrypto.core.xof/Xof.delegate|{}delegate[0]
3735
final fun <get-delegate>(): #A // org.kotlincrypto.core.xof/Xof.delegate.<get-delegate>|<get-delegate>(){}[0]
3836

3937
abstract fun newReader(): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.newReader|newReader(){}[0]
40-
final fun reader(kotlin/Boolean =...): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.reader|reader(kotlin.Boolean){}[0]
38+
final fun reader(kotlin/Boolean = ...): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.reader|reader(kotlin.Boolean){}[0]
4139
final fun toString(): kotlin/String // org.kotlincrypto.core.xof/Xof.toString|toString(){}[0]
42-
final inline fun <#A1: kotlin/Any?> use(kotlin/Boolean =..., kotlin/Function1<org.kotlincrypto.core.xof/Xof.Reader<#A>, #A1>): #A1 // org.kotlincrypto.core.xof/Xof.use|use(kotlin.Boolean;kotlin.Function1<org.kotlincrypto.core.xof.Xof.Reader<1:0>,0:0>){0§<kotlin.Any?>}[0]
40+
final inline fun <#A1: kotlin/Any?> use(kotlin/Boolean = ..., kotlin/Function1<org.kotlincrypto.core.xof/Xof.Reader<#A>, #A1>): #A1 // org.kotlincrypto.core.xof/Xof.use|use(kotlin.Boolean;kotlin.Function1<org.kotlincrypto.core.xof.Xof.Reader<1:0>,0:0>){0§<kotlin.Any?>}[0]
4341

4442
abstract inner class Reader { // org.kotlincrypto.core.xof/Xof.Reader|null[0]
4543
constructor <init>() // org.kotlincrypto.core.xof/Xof.Reader.<init>|<init>(){}[0]

0 commit comments

Comments
 (0)