Merge branch 'release/0.3.6'

Author: mirceanis

.circleci/config.yml

@@ -46,6 +46,11 @@ jobs:
       # upload test coverage report!
       - run: bash <(curl -s https://codecov.io/bash)
 
+      # run linter
+      - run: ./gradlew detekt
+      - store_artifacts:
+          path: ./build/reports
+
 workflows:
   version: 2
   workflow:

README.md

@@ -63,7 +63,7 @@ allprojects {
 In your application `build.gradle` file, add:
 
 ```groovy
-def did_jwt_version = "0.3.5"
+def did_jwt_version = "0.3.6"
 dependencies {
     //...
     implementation "com.github.uport-project.kotlin-did-jwt:jwt:$did_jwt_version"
@@ -149,6 +149,10 @@ so that only tokens intended for your app are considered valid.
 
 ## CHANGELOG
 
+* 0.3.6
+    - fix: okhttp dependency issue (#43)
+    - docs: mark UportDIDResolver as deprecated
+    - refactor: code cleanup, enforcing detekt on PRs  
 * 0.3.5
     - feat: add credential status / revocation support (#35)(#42)
     - support: bump dependencies (#44)

build.gradle

@@ -3,28 +3,26 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.3.70'
-        kotlin_serialization_version = '0.20.0'
+        kotlin_version = "1.3.70"
+        kotlin_serialization_version = "0.20.0"
         coroutines_version = "1.3.5"
 
         junit_version = "4.12"
         mockk_version = "1.9.3"
-        assertk_version = "0.13"
-        detekt_version = "1.0.0-RC14"
+        assertk_version = "0.22"
+        detekt_version = "1.6.0"
         jacoco_version = "0.8.4"
 
-        okhttp_version = "4.4.1"
-
         bivrost_version = "v0.7.1"
         kmnid_version = "0.4.4"
         kethereum_version = "0.81.4"
         khex_version = "1.0.0-RC6"
         khash_version = "1.0.0-RC5"
         kbase58_version = "0.1"
         spongycastle_version = "1.58.0.0"
-        uport_kotlin_common_version = "0.4.2"
+        uport_kotlin_common_version = "0.4.3"
 
-        current_release_version = "0.3.5"
+        current_release_version = "0.3.6"
     }
 
     repositories {
@@ -56,8 +54,8 @@ detekt {
     input = files(
             "$projectDir"
     )
-    //config = "${projectDir}/detekt.yml"
-    filters = ".*test.*,.*/resources/.*,.*/tmp/.*,.*/build/.*"
+    config = files("${projectDir}/detekt.yml")
+    baseline = file("${projectDir}/detekt_baseline.xml")
     parallel = true
     reports {
         xml {
@@ -73,7 +71,7 @@ detekt {
 
 allprojects {
 
-    apply plugin: 'jacoco'
+    apply plugin: "jacoco"
 
     jacoco {
         toolVersion = jacoco_version
@@ -82,7 +80,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
+        maven { url "https://jitpack.io" }
         maven { url "https://kotlin.bintray.com/kotlinx" }
 //        mavenLocal()
     }
@@ -96,9 +94,9 @@ allprojects {
         }
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             def requested = details.requested
-            if (requested.group == 'org.jetbrains.kotlin' && requested.name in [
-                    'kotlin-reflect', 'kotlin-stdlib', 'kotlin-stdlib-common',
-                    'kotlin-stdlib-jdk7', 'kotlin-stdlib-jdk8',
+            if (requested.group == "org.jetbrains.kotlin" && requested.name in [
+                    "kotlin-reflect", "kotlin-stdlib", "kotlin-stdlib-common",
+                    "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8",
             ]) {
                 details.useVersion kotlin_version
             }

credential-status/src/main/java/me/uport/credential_status/StatusResolver.kt renamed to credential-status/src/main/java/me/uport/credentialstatus/StatusResolver.kt

@@ -1,4 +1,4 @@
-package me.uport.credential_status
+package me.uport.credentialstatus
 
 import me.uport.sdk.universaldid.DIDDocument
 
@@ -41,4 +41,4 @@ interface StatusResolver {
      * Checks the status of a given credential and returns a [CredentialStatus] or throws an error
      */
     suspend fun checkStatus(credential: String, didDoc: DIDDocument): CredentialStatus
-}
+}

credential-status/src/main/java/me/uport/credential_status/UniversalStatusResolver.kt renamed to credential-status/src/main/java/me/uport/credentialstatus/UniversalStatusResolver.kt

@@ -1,8 +1,6 @@
-package me.uport.credential_status
+package me.uport.credentialstatus
 
 import me.uport.sdk.universaldid.DIDDocument
-import me.uport.sdk.universaldid.UniversalDID.method
-import me.uport.sdk.universaldid.UniversalDID.registerResolver
 
 /**
  *
@@ -36,12 +34,13 @@ class UniversalStatusResolver : StatusResolver {
 
         val statusEntry = getStatusEntry(credential)
 
-        if (statusEntry.type.isBlank() || !resolvers.containsKey(statusEntry.type)) {
-            throw IllegalStateException("There is no StatusResolver registered to check status using '${statusEntry.type}' method.")
-        } else {
-            return resolvers[statusEntry.type]?.checkStatus(credential, didDoc)
-                ?: throw IllegalStateException("There StatusResolver for '$statusEntry.type' failed to resolve for an unknown reason.")
+        val resolver = resolvers[statusEntry.type]
+
+        check(statusEntry.type.isNotBlank() && resolver != null) {
+            "There is no StatusResolver registered to check status using '${statusEntry.type}' method."
         }
+
+        return resolver.checkStatus(credential, didDoc)
     }
 
 
@@ -54,4 +53,4 @@ class UniversalStatusResolver : StatusResolver {
         }
         resolvers[resolver.method] = resolver
     }
-}
+}

credential-status/src/main/java/me/uport/credential_status/Utils.kt renamed to credential-status/src/main/java/me/uport/credentialstatus/Utils.kt

@@ -1,4 +1,4 @@
-package me.uport.credential_status
+package me.uport.credentialstatus
 
 import me.uport.sdk.jwt.JWTTools
 
@@ -15,4 +15,4 @@ fun getStatusEntry(credential: String): StatusEntry {
         status["type"] ?: "",
         status["id"] ?: ""
     )
-}
+}

credential-status/src/test/java/me/uport/sdk/credential_status/UniversalStatusResolverTests.kt

@@ -2,13 +2,15 @@
 
 package me.uport.sdk.credential_status
 
+import assertk.all
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
 import assertk.assertions.isInstanceOf
 import kotlinx.coroutines.runBlocking
-import me.uport.credential_status.CredentialStatus
-import me.uport.credential_status.StatusResolver
-import me.uport.credential_status.UniversalStatusResolver
+import me.uport.credentialstatus.CredentialStatus
+import me.uport.credentialstatus.StatusResolver
+import me.uport.credentialstatus.UniversalStatusResolver
 import me.uport.sdk.ethrdid.EthrDIDDocument
 import me.uport.sdk.testhelpers.coAssert
 import me.uport.sdk.universaldid.DIDDocument
@@ -58,9 +60,10 @@ class UniversalStatusResolverTests {
         coAssert {
             UniversalStatusResolver().checkStatus(
                 "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1NzMwNDczNTEsInN0YXR1cyI6eyJ0eXBlIjoiRXRoclN0YXR1c1JlZ2lzdHJ5MjAxOSIsImlkIjoicmlua2VieToweDFFNDY1MWRjYTVFZjM4NjM2ZTJFNEQ3QTZGZjRkMjQxM2ZDNTY0NTAifSwiaXNzIjoiZGlkOmV0aHI6MHgxZmNmOGZmNzhhYzUxMTdkOWM5OWI4MzBjNzRiNjY2OGQ2YWMzMjI5In0.MHabafA0UxJuQJ0Z-7Egb57WRlgj4_zf96B0LUhRyXgVDU5RABIczTTTXWjcuKVzhJc_-FuhRI8uQYmQQNxKzgA"
-                , didDoc
+                ,
+                didDoc
             )
-        }.thrownError {
+        }.isFailure().all {
             isInstanceOf(IllegalStateException::class)
         }
     }
@@ -74,7 +77,7 @@ class UniversalStatusResolverTests {
                 "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
                 didDoc
             )
-        }.thrownError {
+        }.isFailure().all {
             isInstanceOf(IllegalArgumentException::class)
         }
     }
@@ -86,4 +89,4 @@ class UniversalStatusResolverTests {
         val result = resolver.checkStatus(successfulCred, didDoc)
         assertThat(result).isEqualTo(TestStatus(BigInteger.ONE))
     }
-}
+}