Merge branch 'release/0.3.0'

Author: mirceanis

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
           key: v1-dependencies-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "build.gradle" }}
 
       # run tests!
-      - run: ./gradlew test
+      - run: ./gradlew test jacocoReport
 
       # store test results
       - run:
@@ -43,6 +43,9 @@ jobs:
       - store_artifacts:
           path: ~/test-results
 
+      # upload test coverage report!
+      - run: bash <(curl -s https://codecov.io/bash)
+
 workflows:
   version: 2
   workflow:

README.md

@@ -23,6 +23,7 @@ We currently support the following DID methods:
 - [`web`](https://github.com/uport-project/https-did-resolver)
 - [`https`](https://github.com/uport-project/https-did-resolver) *DEPRECATED*
 
+
 Defaults are automatically installed but you can customize to fit your needs.
 
 Support for other DID methods should be simple.
@@ -53,7 +54,7 @@ allprojects {
 In your application `build.gradle` file, add:
 
 ```groovy
-def did_jwt_version = "0.2.0"
+def did_jwt_version = "0.2.1"
 dependencies {
     //...
     implementation "com.github.uport-project.kotlin-did-jwt:jwt:$did_jwt_version"
@@ -133,6 +134,11 @@ so that only tokens intended for your app are considered valid.
 
 ## CHANGELOG
 
+* 0.3.0
+    - [breaking] remove deprecated `https-did` module, now replaced by `web-did` (#14)
+    - add test coverage metrics (#10)
+    - add support for arbitrary maps with `@Serializer`s as JWT payloads (#16)
+    - remove moshi dependency (#16)
 * 0.2.1
     - add support for web DID, deprecating https DID (#5)
     - allow creation of JWTs with no expiry (#6)
@@ -144,4 +150,4 @@ so that only tokens intended for your app are considered valid.
 * 0.1.2
     - fix crash when parsing legacy identity document 
 * 0.1.1
-    - initial stable release isolating the did-jwt implementation in kotlin along with resolvers
+    - initial stable release isolating the did-jwt implementation in kotlin along with resolvers

build.gradle

@@ -3,17 +3,16 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.3.31'
-        kotlin_serialization_version = '0.11.0'
+        kotlin_version = '1.3.41'
+        kotlin_serialization_version = '0.11.1'
         coroutines_version = "1.2.0"
 
         junit_version = "4.12"
-
         mockk_version = "1.9.3"
         assertk_version = "0.13"
         detekt_version = "1.0.0-RC14"
+        jacoco_version = "0.8.4"
 
-        moshi_version = "1.8.0"
         okhttp_version = "3.14.1"
 
         bivrost_version = "v0.7.1"
@@ -22,7 +21,7 @@ buildscript {
         spongycastle_version = "1.58.0.0"
         uport_kotlin_common_version = "0.1.1"
 
-        current_release_version = "0.2.1"
+        current_release_version = "0.3.0"
     }
 
     repositories {
@@ -70,6 +69,13 @@ detekt {
 }
 
 allprojects {
+
+    apply plugin: 'jacoco'
+
+    jacoco {
+        toolVersion = jacoco_version
+    }
+
     repositories {
         google()
         jcenter()
@@ -111,4 +117,23 @@ apply from: "publishing.gradle"
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
+
+task jacocoReport(type: JacocoReport) {
+    subprojects { sub ->
+        afterEvaluate {
+            //subproject tasks can only be gathered after evaluation
+            def testTasks = sub.tasks.withType(Test)
+            dependsOn testTasks
+            executionData testTasks
+        }
+        classDirectories.from(file("${sub.buildDir}/classes/java/main"))
+        classDirectories.from(file("${sub.buildDir}/classes/kotlin/main"))
+    }
+
+    reports {
+        html.enabled = true
+        xml.enabled = true
+        csv.enabled = false
+    }
+}

ethr-did/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialization_version"
 
     implementation "com.github.gnosis.bivrost-kotlin:bivrost-solidity-types:$bivrost_version"
-    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
 
     api "com.github.komputing.KEthereum:extensions:$kethereum_version"
     api "com.github.komputing.KEthereum:model:$kethereum_version"