Merge branch 'release/0.4.1'

uport-project · Sep 18, 2019 · f37615c · f37615c
2 parents 6bd7351 + 532f7fc
commit f37615c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 32 deletions.
diff --git a/Readme.md b/Readme.md
@@ -59,7 +59,7 @@ repositories {
 
 dependencies {
     //...
-    compile "com.github.uport-project:kmnid:0.4.0"
+    compile "com.github.uport-project:kmnid:0.4.1"
 }
 
 ```
@@ -105,14 +105,16 @@ assertFalse( MNID.isMNID('QmXuNqXmrkxs4WhTDC2GCnXEep4LUD87bu97LQMn1rkxmQ') )
 
 ## Changelog
 
-* 0.4.0 - upcoming
-    * [BREAKING] remove public `Account` constructor to promote error checks (#4)
-    * remove all direct java dependencies, prep for multi-platform support (#5)
-    * increase coverage (55f2311)
+* 0.4.1
+    * simplify import of komputing libraries ( 17534bdf )
+* 0.4.0
+    * [breaking] remove public `Account` constructor to promote error checks  ( #4 )
+    * remove all direct java dependencies, prep for multi-platform support ( #5 )
+    * increase coverage ( 55f2311 )
 * 0.3.3 - maintenance
-    * use kethereum 0.76.1, remove walleth namespace (b0fe925)
-    * use kotlin 1.3.50 (b0fe925)
-    * add coverage (b0fe925)
+    * use kethereum 0.76.1, remove walleth namespace ( b0fe925 )
+    * use kotlin 1.3.50 ( b0fe925 )
+    * add coverage ( b0fe925 )
 * 0.3.2 - maintenance
     * build on circleCI
 * 0.3.1 - maintenance release

diff --git a/build.gradle b/build.gradle
@@ -12,22 +12,10 @@ buildscript {
         khash_version = "1.0.0-RC2"
         khex_version = "1.0.0-RC3"
 
-        //demo app
-        gradle_tools_version = '3.4.0'
-
-        build_tools_version = "28.0.3"
-        compile_sdk_version = 28
-        target_sdk_version = compile_sdk_version
-        min_sdk_version = 19
-
-        support_lib_version = "28.0.0"
-        constraint_layout_version = "1.1.3"
-
         //testing
         test_runner_version = "1.0.2"
-        espresso_version = "3.0.2"
 
-        current_release_version = "0.4.0"
+        current_release_version = "0.4.1"
     }
 
     repositories {
@@ -37,7 +25,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.android.tools.build:gradle:$gradle_tools_version"
+        classpath "com.android.tools.build:gradle:3.5.0"
     }
 }
 

diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -4,12 +4,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion compile_sdk_version
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "me.uport.mnid.demo"
-        minSdkVersion min_sdk_version
-        targetSdkVersion target_sdk_version
+        minSdkVersion 19
+        //noinspection OldTargetApi
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -45,12 +46,12 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation "com.android.support:appcompat-v7:$support_lib_version"
-    implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation "com.android.support.constraint:constraint-layout:1.1.3"
 
 
     //this needs to be added to your project
-    implementation "com.github.uport-project:kmnid:0.3.3"
+    implementation "com.github.uport-project:kmnid:0.4.0"
 //    implementation project(":mnid")
 
     testImplementation "junit:junit:$junit_version"

diff --git a/mnid/build.gradle b/mnid/build.gradle
@@ -8,10 +8,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
 
-    implementation "com.github.komputing.KEthereum:base58:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:hashes:$kethereum_version"
-    implementation "com.github.komputing:KHash:$khash_version"
-    implementation "com.github.komputing.KHex:extensions-jvm:$khex_version"
+    implementation "com.github.komputing.kethereum:base58:$kethereum_version"
+    implementation "com.github.komputing.kethereum:hashes:$kethereum_version"
+    implementation "com.github.komputing:khash:$khash_version"
+    api "com.github.komputing.khex:extensions-jvm:$khex_version"
 
     testImplementation "junit:junit:$junit_version"
 }