Skip to content

Commit 2270df1

Browse files
committed
Upgrade dependencies
1 parent 41d43a9 commit 2270df1

File tree

164 files changed

+4223
-1637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+4223
-1637
lines changed

app/build.gradle

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@ apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'kotlin-kapt'
55

66
static def computeVersionCode() {
7-
106
7+
110
88
}
99

1010
static def computeVersionName() {
11-
return "1.0.6"
11+
return "1.1.0"
1212
}
1313

1414
android {
1515
compileSdkVersion 28
1616
defaultConfig {
17-
applicationId "io.wookey.wallet"
17+
applicationId "io.wookey.wallet.monero"
1818
minSdkVersion 21
1919
targetSdkVersion 28
2020
versionCode computeVersionCode()
2121
versionName computeVersionName()
22-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
22+
// testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2323

2424
javaCompileOptions {
2525
annotationProcessorOptions {
26-
arguments = ["room.schemaLocation":
27-
"$projectDir/schemas".toString()]
26+
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
2827
}
2928
}
3029

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

62-
testImplementation 'junit:junit:4.12'
63-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
64-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
61+
// testImplementation 'junit:junit:4.12'
62+
// androidTestImplementation 'androidx.test.ext:junit:1.1.1'
63+
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
6564

66-
implementation "com.android.support:design:28.0.0"
65+
implementation 'com.google.android.material:material:1.0.0'
6766

6867
// 架构组件
6968
def lifecycle_version = "1.1.1"
70-
implementation "android.arch.lifecycle:extensions:$lifecycle_version"
71-
implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version"
72-
implementation "android.arch.persistence.room:runtime:$lifecycle_version"
73-
kapt "android.arch.persistence.room:compiler:$lifecycle_version"
69+
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
70+
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.0.0'
71+
implementation 'androidx.room:room-runtime:2.0.0'
72+
kapt 'androidx.room:room-compiler:2.0.0'
7473

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

@@ -87,4 +86,14 @@ dependencies {
8786

8887
implementation project(':monero')
8988

89+
implementation project(':helper')
90+
91+
// androidWheelView
92+
implementation 'com.weigan:loopView:0.2.2'
93+
94+
implementation 'com.github.bumptech.glide:glide:4.11.0'
95+
96+
implementation 'androidx.biometric:biometric:1.0.1'
97+
98+
implementation 'com.github.ihsg:PatternLocker:2.5.6'
9099
}

app/proguard-rules.pro

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,28 @@
173173
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
174174
**[] $VALUES;
175175
public *;
176-
}
176+
}
177+
178+
-dontwarn kotlin.**
179+
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler
180+
-keep class kotlinx.coroutines.android.AndroidDispatcherFactory
181+
182+
-keepattributes *Annotation*, InnerClasses
183+
-dontnote kotlinx.serialization.SerializationKt
184+
185+
-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
186+
*** rewind();
187+
}
188+
189+
-keep class kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoaderImpl
190+
191+
-keepclassmembers class kotlin.Metadata {
192+
public <methods>;
193+
}
194+
195+
-dontwarn com.google.android.material.**
196+
-keep class com.google.android.material.** { *; }
197+
198+
-dontwarn androidx.**
199+
-keep class androidx.** { *; }
200+
-keep interface androidx.** { *; }

0 commit comments

Comments
 (0)