Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
WooKeyWallet committed Jun 29, 2020
1 parent 41d43a9 commit 2270df1
Show file tree
Hide file tree
Showing 164 changed files with 4,223 additions and 1,637 deletions.
41 changes: 25 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,26 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

static def computeVersionCode() {
106
110
}

static def computeVersionName() {
return "1.0.6"
return "1.1.0"
}

android {
compileSdkVersion 28
defaultConfig {
applicationId "io.wookey.wallet"
applicationId "io.wookey.wallet.monero"
minSdkVersion 21
targetSdkVersion 28
versionCode computeVersionCode()
versionName computeVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation":
"$projectDir/schemas".toString()]
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
}
}

Expand Down Expand Up @@ -56,21 +55,21 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
// testImplementation 'junit:junit:4.12'
// androidTestImplementation 'androidx.test.ext:junit:1.1.1'
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

implementation "com.android.support:design:28.0.0"
implementation 'com.google.android.material:material:1.0.0'

// 架构组件
def lifecycle_version = "1.1.1"
implementation "android.arch.lifecycle:extensions:$lifecycle_version"
implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version"
implementation "android.arch.persistence.room:runtime:$lifecycle_version"
kapt "android.arch.persistence.room:compiler:$lifecycle_version"
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.0.0'
implementation 'androidx.room:room-runtime:2.0.0'
kapt 'androidx.room:room-compiler:2.0.0'

implementation "com.github.lygttpod:SuperTextView:2.1.8"

Expand All @@ -87,4 +86,14 @@ dependencies {

implementation project(':monero')

implementation project(':helper')

// androidWheelView
implementation 'com.weigan:loopView:0.2.2'

implementation 'com.github.bumptech.glide:glide:4.11.0'

implementation 'androidx.biometric:biometric:1.0.1'

implementation 'com.github.ihsg:PatternLocker:2.5.6'
}
26 changes: 25 additions & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,28 @@
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
**[] $VALUES;
public *;
}
}

-dontwarn kotlin.**
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler
-keep class kotlinx.coroutines.android.AndroidDispatcherFactory

-keepattributes *Annotation*, InnerClasses
-dontnote kotlinx.serialization.SerializationKt

-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
*** rewind();
}

-keep class kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoaderImpl

-keepclassmembers class kotlin.Metadata {
public <methods>;
}

-dontwarn com.google.android.material.**
-keep class com.google.android.material.** { *; }

-dontwarn androidx.**
-keep class androidx.** { *; }
-keep interface androidx.** { *; }
Loading

0 comments on commit 2270df1

Please sign in to comment.