Merge branch 'main' into dependabot/github_actions/walt-id/waltid-ide…

…ntity-cb51bb121eb21eba0f5c12c79c7bb34bbbaa86d5
walt-id · Jan 30, 2025 · 32a7ed7 · 32a7ed7
2 parents 2bc5808 + b01593d
commit 32a7ed7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,11 +21,11 @@ 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
 
-    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/...d-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt b/...d-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")

diff --git 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

diff --git 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
@@ -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"