diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin index ff49862c4..546892002 160000 --- a/conventions-vclib/gradle-conventions-plugin +++ b/conventions-vclib/gradle-conventions-plugin @@ -1 +1 @@ -Subproject commit ff49862c453c2f65230555cff95018c5c014d53b +Subproject commit 5468920025cf45aece58d6d738ef1cfa5a0e11e1 diff --git a/kotlinx.serialization b/kotlinx.serialization index 569ef40b3..db1f41120 160000 --- a/kotlinx.serialization +++ b/kotlinx.serialization @@ -1 +1 @@ -Subproject commit 569ef40b39146a7b9349745327a99d416c788f77 +Subproject commit db1f4112031383d898bf621767d2a8f569841aaa diff --git a/settings.gradle.kts b/settings.gradle.kts index 18a035d80..2833455fb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ rootProject.name = "vclibrary" include(":vclib") include(":vclib-aries") include(":vclib-openid") - +/* includeBuild("kotlinx.serialization") { dependencySubstitution { listOf("", "-jvm", "-iosx64", "-iosarm64", "-iossimulatorarm64").forEach { target -> @@ -16,4 +16,4 @@ includeBuild("kotlinx.serialization") { } } } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts index f2bc55102..4cb4bf857 100644 --- a/vclib/build.gradle.kts +++ b/vclib/build.gradle.kts @@ -36,17 +36,28 @@ tasks.withType().configureEach { exportIosFramework("VcLibKmm", *commonIosExports()) kotlin { + sourceSets { + + val cbor by creating { + this.kotlin.srcDir("${project.rootProject.projectDir.path}/kotlinx.serialization/formats/cbor/commonMain/src") + dependencies{ + commonImplementationDependencies() + } + } + val commonMain by getting { dependencies { - commonImplementationDependencies() api(datetime()) api("at.asitplus:kmmresult:${VcLibVersions.resultlib}") api("io.matthewnelson.kotlin-components:encoding-base16:${VcLibVersions.encoding}") api("io.matthewnelson.kotlin-components:encoding-base64:${VcLibVersions.encoding}") - api(serialization("cbor")) } + dependsOn(cbor) } + + + val commonTest by getting val iosMain by getting diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/DrivingPrivilege.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/DrivingPrivilege.kt index 86ff90bd1..a9545a18f 100644 --- a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/DrivingPrivilege.kt +++ b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/DrivingPrivilege.kt @@ -1,4 +1,4 @@ -@file:OptIn(ExperimentalSerializationApi::class) +@file:OptIn(ExperimentalUnsignedTypes::class) package at.asitplus.wallet.lib.iso @@ -18,7 +18,7 @@ import kotlinx.serialization.encodeToByteArray */ @OptIn(ExperimentalSerializationApi::class) @Serializable -data class DrivingPrivilege( +data class DrivingPrivilege ( @SerialName("vehicle_category_code") val vehicleCategoryCode: String, @ValueTags(1004u)