From 00f5fb39182cbc2058a37074ea613983e794f937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= Date: Fri, 3 Apr 2020 19:18:51 +0800 Subject: [PATCH] fix glide deps --- doric-android/app/build.gradle | 7 +++---- doric-android/doric/build.gradle | 13 ++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doric-android/app/build.gradle b/doric-android/app/build.gradle index 74945645..bdf78695 100644 --- a/doric-android/app/build.gradle +++ b/doric-android/app/build.gradle @@ -30,12 +30,11 @@ dependencies { implementation "com.google.android.material:material:1.0.0" implementation "pub.doric:core:${rootProject.ext.Version}" implementation "pub.doric:devkit:${rootProject.ext.Version}" + implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.2.0' implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.github.bumptech.glide:annotations:4.11.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation "com.qmuiteam:qmui:1.4.0" - annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2' } diff --git a/doric-android/doric/build.gradle b/doric-android/doric/build.gradle index 5bdd61f2..bb04255a 100644 --- a/doric-android/doric/build.gradle +++ b/doric-android/doric/build.gradle @@ -42,13 +42,12 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' api 'com.github.penfeizhou:jsc4a:0.1.0' implementation 'com.squareup.okhttp3:okhttp:3.12.1' - implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.1.0' + implementation('com.github.penfeizhou.android.animation:glide-plugin:2.2.0') { + exclude group:'com.github.bumptech.glide' + } + implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'jp.wasabeef:glide-transformations:4.0.1' implementation "com.google.android.material:material:1.0.0" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - def nav_version = "2.1.0" @@ -56,6 +55,10 @@ dependencies { implementation "androidx.navigation:navigation-ui:$nav_version" implementation "com.qmuiteam:qmui:1.4.0" + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } apply from: rootProject.file('scripts/upload.gradle') \ No newline at end of file