Merge branch 'release/1.3.4'

uport-project · May 28, 2019 · c4c9506 · c4c9506
2 parents 31e3844 + 9721dbc
commit c4c9506
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+/*/.idea/
 
 # Created by https://www.gitignore.io/api/node,swift,macos,linux,xcode,windows,android,reactnative,androidstudio
 

diff --git a/README.md b/README.md
@@ -19,6 +19,10 @@ allprojects {
 }
 ```
 
+3. [optional] If not already done, update the `minSdkVersion` of your `app` to 21
+  This is usually in `android/app/build.gradle` but can also be defined in `android/build.gradle`
+depending on when your project was created
+
 ### Manual installation
 
 
@@ -216,6 +220,9 @@ RNUportSigner.signTx(address,
 ```
 
 ## Changelog
+* 1.3.4
+  - [Android] bugfix - duplicate classes error
+
 * 1.3.3
   - [Android] bugfix - fix silent errors when signing JWT
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -43,6 +43,7 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
 
     api "com.github.uport-project:uport-android-signer:0.3.1"
-    api "com.github.uport-project.kotlin-common:signer-common:0.1.1"
+
+    testImplementation "junit:junit:4.12"
 }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-uport-signer",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "",
   "main": "index.js",
   "scripts": {