diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b675618..e2ea15724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ Release 3.6.0: - `OidcSiopVerifier`: Refactor list of parameters for customizing authentication requests to single data class `RequestOptions` - `OidcSiopWallet`: Rename constructor parameter `jwkSetRetriever` to a more general `remoteResourceRetriever`, to use it for various parameters defined by reference - `OidcSiopWallet`: Replace constructor parameter `verifierJwsService` with `requestObjectJwsVerifier` to allow callers to verify JWS objects with a pre-registered key (as in the OpenId4VP client ID scheme "pre-registered") + - Dependency updates + - Conventions 1.9.23+20240410 + - Ktor 2.3.10 + - Auto-publish version catalogs Release 3.5.0: - Kotlin 1.9.23 diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin index 77f67ae32..07609a8a6 160000 --- a/conventions-vclib/gradle-conventions-plugin +++ b/conventions-vclib/gradle-conventions-plugin @@ -1 +1 @@ -Subproject commit 77f67ae32e0d3177c8b3095ce7b20f8954f900dd +Subproject commit 07609a8a6e419bba5c364f0eb2acdf4e7377d5d0 diff --git a/conventions-vclib/src/main/kotlin/VcLibConventions.kt b/conventions-vclib/src/main/kotlin/VcLibConventions.kt index 8dd09303f..bbd42dea0 100644 --- a/conventions-vclib/src/main/kotlin/VcLibConventions.kt +++ b/conventions-vclib/src/main/kotlin/VcLibConventions.kt @@ -8,32 +8,38 @@ import org.gradle.api.Project import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler -inline fun commonApiDependencies() = listOf( - coroutines(), - serialization("json"), - serialization("cbor"), - "at.asitplus.crypto:datatypes-cose:${VcLibVersions.kmpcrypto}", - "at.asitplus.crypto:datatypes-jws:${VcLibVersions.kmpcrypto}", - datetime(), - "com.squareup.okio:okio:${VcLibVersions.okio}", - "at.asitplus.crypto:datatypes:${VcLibVersions.kmpcrypto}", //for iosExport - "io.matthewnelson.kotlin-components:encoding-base16:${VcLibVersions.encoding}", - "io.matthewnelson.kotlin-components:encoding-base64:${VcLibVersions.encoding}" -) +inline fun Project.commonApiDependencies(): List { + project.AspVersions.versions["kmpcrypto"] = VcLibVersions.kmpcrypto + project.AspVersions.versions["okio"] = VcLibVersions.okio + project.AspVersions.versions["encoding"] = VcLibVersions.encoding + return listOf( + coroutines(), + serialization("json"), + serialization("cbor"), + addDependency("at.asitplus.crypto:datatypes", "kmpcrypto"), //for iOS Export + addDependency("at.asitplus.crypto:datatypes-cose", "kmpcrypto"), + addDependency("at.asitplus.crypto:datatypes-jws", "kmpcrypto"), + datetime(), + addDependency("com.squareup.okio:okio", "okio"), + addDependency("io.matthewnelson.kotlin-components:encoding-base16", "encoding"), + addDependency("io.matthewnelson.kotlin-components:encoding-base64", "encoding"), + ) +} inline fun KotlinDependencyHandler.commonImplementationAndApiDependencies() { - commonApiDependencies().forEach { dep -> api(dep) } + project.commonApiDependencies().forEach { dep -> api(dep) } commonImplementationDependencies() } inline fun KotlinDependencyHandler.commonImplementationDependencies() { - implementation(ktor("http")) - implementation(napier()) - implementation(ktor("utils")) - implementation("com.benasher44:uuid:${VcLibVersions.uuid}") + implementation(project.ktor("http")) + implementation(project.napier()) + implementation(project.ktor("utils")) + project.AspVersions.versions["uuid"] = VcLibVersions.uuid + implementation(project.addDependency("com.benasher44:uuid", "uuid")) } -fun commonIosExports() = arrayOf( +fun Project.commonIosExports() = arrayOf( datetime(), "com.ionspin.kotlin:bignum:${VcLibVersions.bignum}", kmmresult(), diff --git a/conventions-vclib/src/main/kotlin/VcLibVersions.kt b/conventions-vclib/src/main/kotlin/VcLibVersions.kt index aceb2cd4e..e458b754a 100644 --- a/conventions-vclib/src/main/kotlin/VcLibVersions.kt +++ b/conventions-vclib/src/main/kotlin/VcLibVersions.kt @@ -1,6 +1,5 @@ object VcLibVersions { const val uuid = "0.8.1" - const val resultlib = "1.5.3" const val encoding = "1.2.3" const val okio = "3.5.0" const val kmpcrypto = "2.5.0" diff --git a/gradle.properties b/gradle.properties index 07b22df86..c4c2825fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,10 +15,9 @@ kotlin.native.binary.freezing=disabled kotlin.native.ignoreDisabledTargets=true kotlin.experimental.tryK2=false - -# workaround dokka bug (need to wait for next snapshot build) -org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true - artifactVersion = 3.6.0-SNAPSHOT jdk.version=17 +#just in case we add resources +kt65315.workaround=true +