depend on published forked cbor

a-sit-plus · Aug 18, 2023 · a7ad101 · a7ad101
1 parent a1122f1
commit a7ad101
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 47 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,14 +12,3 @@ rootProject.name = "vclibrary"
 include(":vclib")
 include(":vclib-aries")
 include(":vclib-openid")
-/*
-includeBuild("kotlinx.serialization") {
-    dependencySubstitution {
-        listOf("", "-jvm", "-iosx64", "-iosarm64", "-iossimulatorarm64").forEach { target ->
-            listOf("core", "json", "cbor", "properties").forEach { format ->
-                substitute(module("org.jetbrains.kotlinx:kotlinx-serialization-$format$target"))
-                    .using(project(":kotlinx-serialization-$format"))
-            }
-        }
-    }
-}*/
diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
@@ -41,11 +41,6 @@ kotlin {
     }
 }
 
-repositories {
-    maven(uri(rootProject.layout.projectDirectory.dir("kotlinx.serialization").dir("repo")))
-    mavenCentral()
-}
-
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {

diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
@@ -41,11 +41,6 @@ kotlin {
     }
 }
 
-repositories {
-    maven(uri(rootProject.layout.projectDirectory.dir("kotlinx.serialization").dir("repo")))
-    mavenCentral()
-}
-
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {

diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -24,24 +24,7 @@ kotlin {
             dependencies {
                 commonImplementationDependencies()
                 api(datetime())
-                api(serialization("cbor")) {
-                    rootProject.layout.projectDirectory.dir("kotlinx.serialization").dir("repo").asFile.let {
-                        if (it.exists() && it.isDirectory && it.listFiles()!!.isNotEmpty()) {
-                            logger.info("assuming serialization maven artifact present")
-                        } else {
-                            exec {
-                                workingDir = rootProject.layout.projectDirectory.dir("kotlinx.serialization").asFile
-                                println("descending into ${workingDir.absolutePath}")
-                                logger.lifecycle("Rebuilding serialization maven artifacts")
-                                commandLine(
-                                    "./gradlew",
-                                    "-Pnative.deploy=true",
-                                    "publishAllPublicationsToLocalRepository"
-                                )
-                            }
-                        }
-                    }
-                }
+                api(serialization("cbor"))
                 api("at.asitplus:kmmresult:${VcLibVersions.resultlib}")
                 api("io.matthewnelson.kotlin-components:encoding-base16:${VcLibVersions.encoding}")
                 api("io.matthewnelson.kotlin-components:encoding-base64:${VcLibVersions.encoding}")
@@ -67,12 +50,6 @@ kotlin {
     }
 }
 
-repositories {
-    maven(uri(rootProject.layout.projectDirectory.dir("kotlinx.serialization").dir("repo")))
-    mavenCentral()
-}
-
-
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/cborSerializer.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/iso/cborSerializer.kt
@@ -10,6 +10,5 @@ val cborSerializer by lazy {
         alwaysUseByteString = true
         encodeDefaults = false
         writeDefiniteLengths = true
-        explicitNulls = true
     }
 }