Merge branch 'release/1.1.2'

.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:

CHANGELOG.md

@@ -1,5 +1,9 @@
+* 0.1.2
+    * maintenance - add test coverage
+
 * 0.1.1
     * maintenance - fix a bad test
+
 * 0.1.0
     * isolated signer-common module and library.
     * Signer import coordinates have changed to `me.uport.sdk.signer` 

README.md

@@ -87,7 +87,7 @@ allprojects {
 In your module `build.gradle` file, add:
 
 ```groovy
-def uport_kotlin_common_version = "0.1.1"
+def uport_kotlin_common_version = "0.1.2"
 dependencies {
     //...
     // core lib

build.gradle

@@ -3,14 +3,15 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.3.31'
-        kotlin_serialization_version = '0.11.0'
-        coroutines_version = "1.2.0"
+        kotlin_version = '1.3.41'
+        kotlin_serialization_version = '0.11.1'
+        coroutines_version = "1.2.2"
 
         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"
@@ -19,7 +20,7 @@ buildscript {
         kmnid_version = "0.3.2"
         kethereum_version = "0.75.1"
 
-        current_release_version = "0.1.1"
+        current_release_version = "0.1.2"
     }
 
     repositories {
@@ -66,12 +67,19 @@ detekt {
 }
 
 allprojects {
+
+    apply plugin: 'jacoco'
+
+    jacoco {
+        toolVersion = jacoco_version
+    }
+
     repositories {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
         maven { url "https://kotlin.bintray.com/kotlinx" }
-        mavenLocal()
+//        mavenLocal()
     }
 
 //address warnings about multiple kotlin runtimes in classpath
@@ -103,4 +111,23 @@ subprojects { subproject ->
     }
 }
 
-apply from: "publishing.gradle"
+apply from: "publishing.gradle"
+
+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
+    }
+}

core/build.gradle

@@ -7,7 +7,7 @@ project.ext.description = "core class definitions of the uPort kotlin SDK"
 
 //XXX: this is needed until https://github.com/komputing/KEthereum/issues/65 is fixed
 configurations.all {
-    exclude group: "com.github.walleth", module: "sha3"
+    exclude group: "com.github.walleth"
 }
 
 dependencies {

gradle.properties

@@ -13,6 +13,5 @@ org.gradle.jvmargs=-Xmx3200m
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configureondemand=true
-
 kotlin.code.style=official
 kotlin.incremental=true

jsonrpc/build.gradle

@@ -13,7 +13,7 @@ compileKotlin {
 
 //XXX: this is needed until https://github.com/komputing/KEthereum/issues/65 is fixed
 configurations.all {
-    exclude group: "com.github.walleth", module: "sha3"
+    exclude group: "com.github.walleth"
 }
 
 dependencies {

signer-common/build.gradle

@@ -7,7 +7,7 @@ project.ext.description = "Signer interface and default implementation for uPort
 
 //XXX: this is needed until https://github.com/komputing/KEthereum/issues/65 is fixed
 configurations.all {
-    exclude group: "com.github.walleth", module: "sha3"
+    exclude group: "com.github.walleth"
 }
 
 dependencies {