Merge remote-tracking branch 'origin/master'

didi · Jun 24, 2020 · 4337308 · 4337308
2 parents 8063775 + e9e2b24
commit 4337308
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 520 deletions.
diff --git a/Android/aoe/core/build.gradle b/Android/aoe/core/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     implementation deps.kotlin
     implementation deps.gson
 
-    implementation "androidx.concurrent:concurrent-futures-ktx:1.1.0-alpha01"
 }
 
 ext {

diff --git a/Android/aoe/core/src/main/java/com/didi/aoe/library/core/executer/AoeExecutors.kt b/Android/aoe/core/src/main/java/com/didi/aoe/library/core/executer/AoeExecutors.kt
diff --git a/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/AsyncFunction.kt b/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/AsyncFunction.kt
diff --git a/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/ChainingListenableFuture.kt b/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/ChainingListenableFuture.kt
diff --git a/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/FutureCallback.kt b/Android/aoe/core/src/main/java/com/didi/aoe/library/core/futures/FutureCallback.kt
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ dependencies { @@
         implementation deps.kotlin
         implementation deps.gson
-        implementation "androidx.concurrent:concurrent-futures-ktx:1.1.0-alpha01"
     }
     ext {
@@ Expand Down @@