Skip to content

Commit

Permalink
Merge pull request #1 from ligi/fix_build_errors
Browse files Browse the repository at this point in the history
Fix build errors
  • Loading branch information
bitgamma authored Nov 28, 2019
2 parents 3cfd782 + be13da3 commit 22611e5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.

0 comments on commit 22611e5

Please sign in to comment.