Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorporate open PR changes #913

Merged
merged 4 commits into from
Jan 30, 2025
+7 −7
Merged

Incorporate open PR changes #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fa73cf
Fix UniResolver not checking JSON comparison semantically
waltkb Jan 30, 2025
7368085
Fix LocalRegistrar not getting supported methods dynamically
waltkb Jan 30, 2025
7514450
Update ben-manes.versions in root, service-commons, service-commons-test
waltkb Jan 30, 2025
2217a7e
Update Kotlin compiler plugin to 2.1.0-0.10.1
waltkb Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 1 addition & 2 deletions ...d-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/LocalRegistrar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion waltid-libraries/waltid-did/src/jvmTest/kotlin/resolvers/UniResolverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion waltid-services/waltid-service-commons-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion waltid-services/waltid-service-commons/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down