Merge pull request #1 from ligi/fix_build_errors

Fix build errors
This commit is contained in:
Bitgamma 2019-11-28 16:49:15 +03:00 committed by GitHub
commit 22611e5ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions

View File

@ -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'

View File

@ -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()

0
gradlew vendored Normal file → Executable file
View File