Merge branch 'release/0.4.4'

uport-project · Mar 20, 2020 · 2885d75 · 2885d75
2 parents c52430d + 1b464bf
commit 2885d75
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/Readme.md b/Readme.md
@@ -59,7 +59,7 @@ repositories {
 
 dependencies {
     //...
-    compile "com.github.uport-project:kmnid:0.4.3"
+    compile "com.github.uport-project:kmnid:0.4.4"
 }
 
 ```
@@ -105,7 +105,9 @@ assertFalse( MNID.isMNID('QmXuNqXmrkxs4WhTDC2GCnXEep4LUD87bu97LQMn1rkxmQ') )
 
 ## Changelog
 
-* 0.4.3
+* 0.4.4
+    * fix pom file by using `implementation` declaration ( #6 )
+*0.4.3
     * bump dependencies (kotlin 1.3.70, kethereum 0.81.4) ( 19f867ed )
 * 0.4.2
     * bump kethereum to 0.76.2 ( c2c5b070 )

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         //testing
         test_runner_version = "1.0.2"
 
-        current_release_version = "0.4.3"
+        current_release_version = "0.4.4"
     }
 
     repositories {

diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -31,15 +31,7 @@ android {
     }
 
     packagingOptions {
-        pickFirst 'META-INF/kotlinx-io.kotlin_module'
-        pickFirst 'META-INF/atomicfu.kotlin_module'
-        pickFirst 'META-INF/kbignumbers.kotlin_module'
-        pickFirst 'META-INF/ripemd160.kotlin_module'
-        pickFirst 'META-INF/extensions.kotlin_module'
-        pickFirst 'META-INF/core.kotlin_module'
-        pickFirst 'META-INF/keccak.kotlin_module'
-        pickFirst 'META-INF/sha256.kotlin_module'
-        pickFirst 'META-INF/khash-extensions.kotlin_module'
+        pickFirst 'META-INF/*.kotlin_module'
     }
 }
 
@@ -51,7 +43,7 @@ dependencies {
 
 
     //this needs to be added to your project
-    implementation "com.github.uport-project:kmnid:0.4.0"
+    implementation "com.github.uport-project:kmnid:0.4.3"
 //    implementation project(":mnid")
 
     testImplementation "junit:junit:$junit_version"

diff --git a/demoapp/src/test/java/me/uport/mnid/demo/MnidActivityTest.kt b/demoapp/src/test/java/me/uport/mnid/demo/MnidActivityTest.kt
@@ -1,5 +1,7 @@
 package me.uport.mnid.demo
 
+import me.uport.mnid.Account
+import org.junit.Assert
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
@@ -10,4 +12,11 @@ class MnidActivityTest {
         assertTrue(true)
     }
 
+    @Test
+    fun `can use library`() {
+        val expected = Account.from("0x01", "0x0000000000000000000000000000000000001234")
+        val acc = Account.from("2nQs23uc3UN6BBPqGHpbudDxBkeNVX7YRBb")
+        Assert.assertEquals(expected, acc)
+    }
+
 }
diff --git a/mnid/build.gradle b/mnid/build.gradle
@@ -8,9 +8,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
 
-    api "com.github.komputing:kbase58:$kbase58_version"
-    api "com.github.komputing:khash:$khash_version"
-    api "com.github.komputing.khex:extensions:$khex_version"
+    implementation "com.github.komputing:kbase58:$kbase58_version"
+    implementation "com.github.komputing:khash:$khash_version"
+    implementation "com.github.komputing.khex:extensions:$khex_version"
 
     testImplementation "junit:junit:$junit_version"
 }