Merge branch 'release/0.3.0'

uport-project · Sep 16, 2019 · 9d10ddb · 9d10ddb
2 parents b94cab9 + 4b6e770
commit 9d10ddb
Show file tree

Hide file tree

Showing 20 changed files with 757 additions and 282 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+* 0.3.0
+    * refactor - replace moshi with kotlinx.serialization ( #6 )
+    * feature - add ethChainId  ( f658925f )
+    * feature - throw more specific JsonRpcInvalidArgumentException ( a79b3a01 )
+
 * 0.2.0
     * update to kethereum 0.76.1 [#5](https://github.com/uport-project/kotlin-common/pull/5)
     * [breaking] isolate implementation details for each module (#5)

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ allprojects {
 In your module `build.gradle` file, add:
 
 ```groovy
-def uport_kotlin_common_version = "0.2.0"
+def uport_kotlin_common_version = "0.3.0"
 dependencies {
     //...
     // core lib

diff --git a/build.gradle b/build.gradle
@@ -13,15 +13,14 @@ buildscript {
         detekt_version = "1.0.0-RC14"
         jacoco_version = "0.8.4"
 
-        moshi_version = "1.8.0"
         okhttp_version = "3.14.1"
 
         spongycastle_version = "1.58.0.0"
         kmnid_version = "0.4.0"
         kethereum_version = "0.76.1"
         khex_version = "1.0.0-RC3"
 
-        current_release_version = "0.2.0"
+        current_release_version = "0.3.0"
     }
 
     repositories {

diff --git a/jsonrpc/build.gradle b/jsonrpc/build.gradle
@@ -2,6 +2,7 @@ apply plugin: "java-library"
 apply plugin: "kotlin"
 apply plugin: "maven"
 apply plugin: "com.jfrog.bintray"
+apply plugin: "kotlinx-serialization"
 
 project.ext.description = "wrappers for calling ethereum endpoints using json-rpc"
 
@@ -14,8 +15,7 @@ compileKotlin {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-
-    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialization_version"
 
     implementation "com.github.komputing.KEthereum:extensions:$kethereum_version"
     implementation "com.github.komputing.KHex:extensions-jvm:$khex_version"
@@ -25,4 +25,5 @@ dependencies {
     testImplementation "junit:junit:$junit_version"
     testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertk_version"
     testImplementation "io.mockk:mockk:$mockk_version"
+    testImplementation project(":test-helpers")
 }