Skip to content

Update dependencies #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 15, 2025
Merged
497 changes: 222 additions & 275 deletions .kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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) }
Expand All @@ -36,6 +35,7 @@ kmpConfiguration {
jvm { register() }

js { target { browser(); nodejs() }; register() }
@OptIn(ExperimentalWasmDsl::class)
wasmJs { target { browser(); nodejs() }; register() }

val nativeHost = "nativeHost"
Expand Down
6 changes: 1 addition & 5 deletions build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -39,20 +38,17 @@ fun KmpConfigurationExtension.configureShared(
compileSourceCompatibility = JavaVersion.VERSION_1_8
compileTargetCompatibility = JavaVersion.VERSION_1_8

@OptIn(ExperimentalKmpConfigurationApi::class)
java9ModuleInfoName = java9ModuleName
}

js()

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
target {
browser()
nodejs()
}
}

@OptIn(ExperimentalWasmDsl::class)
wasmWasi {
target {
Expand Down
1 change: 1 addition & 0 deletions build-logic/src/main/kotlin/dokka.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ plugins {
id("org.jetbrains.dokka")
}

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

Expand Down
13 changes: 10 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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")
Expand All @@ -44,8 +53,6 @@ plugins.withType<YarnPlugin> {
}

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

Expand Down
17 changes: 9 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[versions]
androidx-test-runner = "1.5.2"
#noinspection GradleDependency
androidx-test-runner = "1.5.2" # Do not upgrade. Tests run for API 15+, where next version requires minSdk 19+

gradle-benchmark = "0.4.11"
gradle-android = "8.2.2"
gradle-binary-compat = "0.16.3"
gradle-benchmark = "0.4.13"
gradle-android = "8.7.3"
gradle-binary-compat = "0.17.0"
gradle-dokka = "1.9.20"
gradle-kmp-configuration = "0.3.2"
gradle-kotlin = "1.9.24"
gradle-publish-maven = "0.29.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" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions library/digest/api/digest.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,4 @@ abstract class org.kotlincrypto.core.digest/Digest : org.kotlincrypto.core/Algor
open fun updateProtected(kotlin/ByteArray, kotlin/Int, kotlin/Int) // org.kotlincrypto.core.digest/Digest.updateProtected|updateProtected(kotlin.ByteArray;kotlin.Int;kotlin.Int){}[0]
}

sealed class org.kotlincrypto.core.digest.internal/DigestState { // org.kotlincrypto.core.digest.internal/DigestState|null[0]
constructor <init>() // org.kotlincrypto.core.digest.internal/DigestState.<init>|<init>(){}[0]
}
sealed class org.kotlincrypto.core.digest.internal/DigestState // org.kotlincrypto.core.digest.internal/DigestState|null[0]
2 changes: 1 addition & 1 deletion library/mac/api/mac.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ abstract class org.kotlincrypto.core.mac/Mac : org.kotlincrypto.core/Algorithm,
constructor <init>(kotlin/ByteArray, kotlin/Boolean) // org.kotlincrypto.core.mac/Mac.Engine.<init>|<init>(kotlin.ByteArray;kotlin.Boolean){}[0]
constructor <init>(org.kotlincrypto.core.mac/Mac.Engine) // org.kotlincrypto.core.mac/Mac.Engine.<init>|<init>(org.kotlincrypto.core.mac.Mac.Engine){}[0]

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

abstract fun doFinal(): kotlin/ByteArray // org.kotlincrypto.core.mac/Mac.Engine.doFinal|doFinal(){}[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.kotlincrypto.core.mac

import org.kotlincrypto.core.*
import org.kotlincrypto.error.ShortBufferException
import kotlin.jvm.JvmField

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

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package org.kotlincrypto.core.mac
import org.kotlincrypto.core.*
import org.kotlincrypto.core.mac.internal.*
import org.kotlincrypto.error.ShortBufferException
import kotlin.jvm.JvmField

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

/**
Expand Down
6 changes: 2 additions & 4 deletions library/xof/api/xof.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ abstract class <#A: org.kotlincrypto.core.xof/XofAlgorithm> org.kotlincrypto.cor
}

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]
constructor <init>(#A) // org.kotlincrypto.core.xof/Xof.<init>|<init>(1:0){}[0]

final val delegate // org.kotlincrypto.core.xof/Xof.delegate|{}delegate[0]
final fun <get-delegate>(): #A // org.kotlincrypto.core.xof/Xof.delegate.<get-delegate>|<get-delegate>(){}[0]

abstract fun newReader(): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.newReader|newReader(){}[0]
final fun reader(kotlin/Boolean =...): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.reader|reader(kotlin.Boolean){}[0]
final fun reader(kotlin/Boolean = ...): org.kotlincrypto.core.xof/Xof.Reader<#A> // org.kotlincrypto.core.xof/Xof.reader|reader(kotlin.Boolean){}[0]
final fun toString(): kotlin/String // org.kotlincrypto.core.xof/Xof.toString|toString(){}[0]
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]
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]

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