From be13da3fcad145382bc4fac63b550517bb43ad33 Mon Sep 17 00:00:00 2001 From: ligi Date: Thu, 28 Nov 2019 18:33:14 +0900 Subject: [PATCH] Fix build errors --- app/build.gradle | 13 ++++++++----- build.gradle | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc2cda0..829aeed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,17 +33,20 @@ android { packagingOptions { exclude 'META-INF/main.kotlin_module' - } - - packagingOptions { pickFirst 'META-INF/kotlinx-io.kotlin_module' pickFirst 'META-INF/atomicfu.kotlin_module' pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module' } + + android { + lintOptions { + warning 'InvalidPackage' // for bouncycastle + } + } + } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.core:core-ktx:1.1.0' @@ -58,7 +61,7 @@ dependencies { implementation 'androidx.security:security-crypto:1.0.0-alpha02' implementation 'org.bouncycastle:bcprov-jdk15on:1.64' implementation 'com.github.status-im.status-keycard-java:android:3.0.1' - implementation 'com.github.walletconnect:kotlin-walletconnect-lib:0.9.3' + implementation 'com.github.walletconnect:kotlin-walletconnect-lib:0.9.4' implementation 'com.journeyapps:zxing-android-embedded:4.0.0' implementation 'com.google.zxing:core:3.4.0' implementation 'com.squareup.moshi:moshi:1.9.1' diff --git a/build.gradle b/build.gradle index 7e5205f..1e19477 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.3.50' - ext.kethereum_version = '0.76.9' + ext.kethereum_version = '0.79.1' repositories { google()