Fix build errors
This commit is contained in:
parent
74c8c9f367
commit
be13da3fca
|
@ -33,17 +33,20 @@ android {
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
exclude 'META-INF/main.kotlin_module'
|
exclude 'META-INF/main.kotlin_module'
|
||||||
}
|
|
||||||
|
|
||||||
packagingOptions {
|
|
||||||
pickFirst 'META-INF/kotlinx-io.kotlin_module'
|
pickFirst 'META-INF/kotlinx-io.kotlin_module'
|
||||||
pickFirst 'META-INF/atomicfu.kotlin_module'
|
pickFirst 'META-INF/atomicfu.kotlin_module'
|
||||||
pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module'
|
pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
lintOptions {
|
||||||
|
warning 'InvalidPackage' // for bouncycastle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||||
implementation 'androidx.core:core-ktx: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 'androidx.security:security-crypto:1.0.0-alpha02'
|
||||||
implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
|
implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
|
||||||
implementation 'com.github.status-im.status-keycard-java:android:3.0.1'
|
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.journeyapps:zxing-android-embedded:4.0.0'
|
||||||
implementation 'com.google.zxing:core:3.4.0'
|
implementation 'com.google.zxing:core:3.4.0'
|
||||||
implementation 'com.squareup.moshi:moshi:1.9.1'
|
implementation 'com.squareup.moshi:moshi:1.9.1'
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.3.50'
|
ext.kotlin_version = '1.3.50'
|
||||||
ext.kethereum_version = '0.76.9'
|
ext.kethereum_version = '0.79.1'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
|
Loading…
Reference in New Issue