Merge pull request #1 from ahmedrageh1/master

Minor update
chenxyu · Feb 2, 2021 · 9760d4b · 9760d4b
2 parents c6dcc70 + 1045c47
commit 9760d4b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/adapter-flow/build.gradle b/adapter-flow/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.chenxyu'
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
 
     defaultConfig {
         minSdkVersion 21

diff --git a/adapter-flow/src/main/java/com/chenxyu/retrofit/adapter/FlowCallAdapter.kt b/adapter-flow/src/main/java/com/chenxyu/retrofit/adapter/FlowCallAdapter.kt
@@ -43,7 +43,7 @@ internal class FlowCallAdapter<R>(private val responseType: Type) :
                     }
 
                     override fun onFailure(call: Call<R>, throwable: Throwable) {
-                        cancel(CancellationException(throwable.message))
+                        cancel(CancellationException(throwable.localizedMessage, throwable))
                     }
                 })
             }

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "com.chenxyu.example"

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '1.4.21'
     ext.kotlinx_coroutines_version = '1.4.2'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 16 23:36:39 CST 2020
+#Fri Jan 29 20:31:51 EET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                         override fun onFailure(call: Call<R>, throwable: Throwable) {
-                            cancel(CancellationException(throwable.message))
+                            cancel(CancellationException(throwable.localizedMessage, throwable))
                         }
                     })
                 }
@@ Expand Down @@