Merge branch 'main' into dkulic-patch-1

sicpa-dlab · Jan 11, 2024 · cd463b6 · cd463b6
2 parents 0efd0fb + 0dcc449
commit cd463b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,23 +1,22 @@
 # Project-wide Gradle settings.
 
-version=0.4.0
+version=0.4.1
 group=org.didcommx
 
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-kotlinJvm=1.7.20
+kotlinJvm=1.8.22
 jvmTarget=1.8
-ktlintGradle=10.1.0
+ktlintGradle=10.3.0
 
-androidGradle=7.0.0
-mannodermausJUnit5=1.8.0.0
+androidGradle=7.3.1
+mannodermausJUnit5=1.8.2.1
 androidxTestRunner=1.4.0
-jUnitJupiter=5.8.0
-mannodermausJUunit5AndroidTest=1.3.0
-googleGson=2.8.8
+jUnitJupiter=5.10.1
+mannodermausJUunit5AndroidTest=1.4.0
+googleGson=2.10.1
 javaMultibase=v1.1.0
-johnrengelmanShadow=7.0.0
 gradleNexusPublish=1.1.0
 champeauJMH=0.6.6
 zmanVarint=1.0.0

diff --git a/lib/src/main/kotlin/org/didcommx/peerdid/DIDDoc.kt b/lib/src/main/kotlin/org/didcommx/peerdid/DIDDoc.kt
@@ -22,7 +22,7 @@ data class DIDDocPeerDID(
          */
         fun fromJson(value: JSON): DIDDocPeerDID {
             val deserializer =
-                JsonDeserializer { json, typeOfT, context ->
+                JsonDeserializer { json, _, _ ->
                     val jsonObject = json?.asJsonObject
                         ?: throw IllegalArgumentException("Invalid JSON")
                     didDocFromJson(jsonObject)

diff --git a/lib/src/main/kotlin/org/didcommx/peerdid/PeerDIDResolver.kt b/lib/src/main/kotlin/org/didcommx/peerdid/PeerDIDResolver.kt
@@ -45,7 +45,6 @@ private fun buildDIDDocNumalgo0(peerDID: PeerDID, format: VerificationMaterialFo
 private fun buildDIDDocNumalgo2(peerDID: PeerDID, format: VerificationMaterialFormatPeerDID): DIDDocPeerDID {
     val keys = peerDID.drop(11)
 
-    var service = ""
     val encodedServicesJson = mutableListOf<JSON>()
     val authentications = mutableListOf<VerificationMethodPeerDID>()
     val keyAgreement = mutableListOf<VerificationMethodPeerDID>()