Merge branch 'release/0.3.6'

uport-project · Oct 3, 2019 · 926bdeb · 926bdeb
2 parents 4a9e48b + f1f5c61
commit 926bdeb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/Readme.md b/Readme.md
@@ -159,6 +159,9 @@ UportHDSigner().signJwtBundle(activity, seedHandle, derivationPath, data, prompt
 
 ### Changelog
 
+#### 0.3.6
+* [support] bump kethereum to 0.76.2 and use lowercase imports ( a4ae6c16 )
+
 #### 0.3.5
 * [feat] add `suspend` extension for `UportHDSigner.signTransaction()` (#21)
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = "1.3.50"
-        android_tools_version = '3.5.0'
+        android_tools_version = '3.5.1'
         coroutines_version = "1.3.0"
 
         build_tools_version = "28.0.3"
@@ -21,14 +21,14 @@ buildscript {
         mockk_version = "1.9.3"
         assertk_version = "0.13"
         detekt_version = "1.0.0-RC14"
+        jacoco_version = "0.8.4"
 
         spongycastle_version = "1.58.0.0"
-        kethereum_version = "0.76.1"
+        kethereum_version = "0.76.2"
         khex_version = "1.0.0-RC3"
-        kotlin_common_version = "0.3.1"
-        jacoco_version = "0.8.4"
+        kotlin_common_version = "0.3.2"
 
-        current_release_version = "0.3.5"
+        current_release_version = "0.3.6"
     }
 
     repositories {

diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -64,9 +64,9 @@ dependencies {
 
     //used to generate and encode seeds to demonstrate importing them
     implementation "com.github.uport-project.kotlin-common:core:$kotlin_common_version"
-    implementation "com.github.komputing.KHex:extensions-jvm:$khex_version"
-    implementation "com.github.komputing.KEthereum:bip39:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:bip39_wordlist_en:$kethereum_version"
+    implementation "com.github.komputing.khex:extensions-jvm:$khex_version"
+    implementation "com.github.komputing.kethereum:bip39:$kethereum_version"
+    implementation "com.github.komputing.kethereum:bip39_wordlist_en:$kethereum_version"
 
     implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"
 

diff --git a/signer/build.gradle b/signer/build.gradle
@@ -56,15 +56,15 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "com.android.support:appcompat-v7:$support_lib_version"
 
-    implementation "com.github.komputing.KEthereum:bip39:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:bip32:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:bip39_wordlist_en:$kethereum_version"
+    implementation "com.github.komputing.kethereum:bip39:$kethereum_version"
+    implementation "com.github.komputing.kethereum:bip32:$kethereum_version"
+    implementation "com.github.komputing.kethereum:bip39_wordlist_en:$kethereum_version"
 
-    api "com.github.komputing.KEthereum:model:$kethereum_version"
+    api "com.github.komputing.kethereum:model:$kethereum_version"
 
-    implementation "com.github.komputing.KEthereum:crypto:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:extensions:$kethereum_version"
-    implementation "com.github.komputing.KEthereum:hashes:$kethereum_version"
+    implementation "com.github.komputing.kethereum:crypto:$kethereum_version"
+    implementation "com.github.komputing.kethereum:extensions:$kethereum_version"
+    implementation "com.github.komputing.kethereum:hashes:$kethereum_version"
     api "com.github.uport-project.kotlin-common:signer-common:$kotlin_common_version"
     implementation "com.github.uport-project.kotlin-common:core:$kotlin_common_version"
     implementation "com.madgag.spongycastle:prov:$spongycastle_version"
@@ -73,9 +73,9 @@ dependencies {
     androidTestImplementation "com.android.support.test:rules:$test_rules_version"
     androidTestImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertk_version"
     androidTestImplementation "com.github.uport-project.kotlin-common:test-helpers:$kotlin_common_version"
-    androidTestImplementation "com.github.komputing.KHex:extensions-jvm:$khex_version"
+    androidTestImplementation "com.github.komputing.khex:extensions-jvm:$khex_version"
 
     testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertk_version"
-    testImplementation "com.github.komputing.KEthereum:bip44:$kethereum_version"
-    testImplementation "com.github.komputing.KHex:extensions-jvm:$khex_version"
+    testImplementation "com.github.komputing.kethereum:bip44:$kethereum_version"
+    testImplementation "com.github.komputing.khex:extensions-jvm:$khex_version"
 }