From 8fa73cff9ecc4d0f4c9fa299f2e54151931a85c4 Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Thu, 30 Jan 2025 01:59:38 +0100 Subject: [PATCH 1/4] Fix UniResolver not checking JSON comparison semantically --- .../waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt index 4feb8017b..2935cd632 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt @@ -3,6 +3,7 @@ package resolvers import id.walt.did.dids.resolver.UniresolverResolver import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest +import kotlinx.serialization.json.Json import org.junit.jupiter.api.condition.EnabledIf import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -26,7 +27,7 @@ class UniResolverTest { println("Resolving: $did") val result = sut.resolve(did).getOrThrow() - check(document == result.toString()) { "Non equal: $document" } + check(Json.parseToJsonElement(document) == result) { "Non equal: $document != $result" } } @ParameterizedTest From 73680854c0bd41488373147c8c19846ef87cfaf2 Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Thu, 30 Jan 2025 01:59:53 +0100 Subject: [PATCH 2/4] Fix LocalRegistrar not getting supported methods dynamically --- .../kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt index 9b054dcdc..9f650aadd 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt @@ -29,8 +29,7 @@ class LocalRegistrar : DidRegistrar { @JvmAsync @JsPromise @JsExport.Ignore - override suspend fun getSupportedMethods() = Result.success(setOf("key", "jwk", "web", "cheqd" /*"ebsi",*/)) - //override suspend fun getSupportedMethods() = Result.success(registrarMethods.values.toSet()) + override suspend fun getSupportedMethods() = Result.success(registrarMethods.values.map { it.method }.toSet()) private fun getRegistrarForMethod(method: String) = registrarMethods[method] ?: throw IllegalArgumentException("No local registrar for method: $method") From 751445029f70974ebe3e47aa1fbe757645eea93f Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Thu, 30 Jan 2025 02:07:28 +0100 Subject: [PATCH 3/4] Update ben-manes.versions in root, service-commons, service-commons-test --- build.gradle.kts | 2 +- waltid-services/waltid-service-commons-test/build.gradle.kts | 2 +- waltid-services/waltid-service-commons/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e477f214..963c15fd1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ plugins { id("com.android.library") version "8.7.3" apply false id("com.android.application") version "8.7.3" apply false - id("com.github.ben-manes.versions") version "0.51.0" apply false + id("com.github.ben-manes.versions") version "0.52.0" apply false } dependencies { implementation(kotlin("stdlib")) diff --git a/waltid-services/waltid-service-commons-test/build.gradle.kts b/waltid-services/waltid-service-commons-test/build.gradle.kts index 6c847b79c..cda32d352 100644 --- a/waltid-services/waltid-service-commons-test/build.gradle.kts +++ b/waltid-services/waltid-service-commons-test/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.51.0" + id("com.github.ben-manes.versions") version "0.52.0" } group = "id.walt" diff --git a/waltid-services/waltid-service-commons/build.gradle.kts b/waltid-services/waltid-service-commons/build.gradle.kts index 5efe73ae4..0aa13b78a 100644 --- a/waltid-services/waltid-service-commons/build.gradle.kts +++ b/waltid-services/waltid-service-commons/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.51.0" + id("com.github.ben-manes.versions") version "0.52.0" } group = "id.walt" From 2217a7e8dd125f0ebb37120b59bb9f0246671c8b Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Thu, 30 Jan 2025 02:10:55 +0100 Subject: [PATCH 4/4] Update Kotlin compiler plugin to 2.1.0-0.10.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 963c15fd1..c9977ea4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { kotlin("plugin.serialization") version kotlinVersion apply false - id("love.forte.plugin.suspend-transform") version "2.1.0-0.10.0" apply false + id("love.forte.plugin.suspend-transform") version "2.1.0-0.10.1" apply false id("com.android.library") version "8.7.3" apply false id("com.android.application") version "8.7.3" apply false