directly compile cbor

a-sit-plus · Aug 10, 2023 · 4b419e9 · 4b419e9
1 parent 2102a2a
commit 4b419e9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/kotlinx.serialization b/kotlinx.serialization
diff --git 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") {
             }
         }
     }
-}
+}*/
diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -36,17 +36,28 @@ tasks.withType<PublishToMavenRepository>().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
@@ -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)