升级依赖库版本号

tencentyun · Oct 23, 2024 · 1199c1b · 1199c1b
1 parent a0a99fa
commit 1199c1b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/explorer/device-android-demo/build.gradle b/explorer/device-android-demo/build.gradle
@@ -120,8 +120,8 @@ dependencies {
 
     implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
     def room_version = "2.2.5"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"

diff --git a/explorer/explorer-device-android/build.gradle b/explorer/explorer-device-android/build.gradle
@@ -151,7 +151,7 @@ dependencies {
         api project(path: ':hub:hub-device-android')
     }
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.squareup.retrofit2:retrofit:2.0.2'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.alibaba:fastjson:2.0.31'
 }
 

diff --git a/...roid/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt b/...roid/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt
@@ -96,7 +96,7 @@ class StringRequest private constructor() {
                     callback.success(response.body(), reqCode)
                 } else {
                     TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                    callback.success(response.errorBody().string(), reqCode)
+                    callback.success(response.errorBody()?.string(), reqCode)
                 }
             }
         })
@@ -127,7 +127,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -159,7 +159,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -191,7 +191,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -239,7 +239,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -280,7 +280,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         TXLog.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 

diff --git a/...com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt b/...com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt
@@ -12,16 +12,16 @@ class StringCallAdapterFactory private constructor() : CallAdapter.Factory() {
         type: Type?,
         array: Array<out Annotation>?,
         retrofit: Retrofit?
-    ): CallAdapter<*>? {
+    ): CallAdapter<Any, String>? {
         if (type == String::class.java)
             return StringCallAdapter()
         return null
     }
 
-    inner class StringCallAdapter : CallAdapter<String> {
-        override fun <R : Any?> adapt(call: Call<R>?): String {
+    inner class StringCallAdapter : CallAdapter<Any, String> {
+        override fun adapt(call: Call<Any>): String {
             try {
-                return call?.execute()?.body().toString()
+                return call.execute().body().toString()
             } catch (e: Exception) {
                 e.printStackTrace()
             }

diff --git a/gradle.properties b/gradle.properties
@@ -19,4 +19,5 @@ android.injected.testOnly=false
 org.gradle.jvmargs=-Xmx1536m
 signing.keyId=MY_KEY_ID
 signing.password=MY_PASSWORD
-signing.secretKeyRingFile=MY_KEY_RING_FILE
+signing.secretKeyRingFile=MY_KEY_RING_FILE
+android.jetifier.blacklist=bcprov
diff --git a/hub/hub-device-java/build.gradle b/hub/hub-device-java/build.gradle
@@ -145,8 +145,8 @@ dependencies {
     api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.mqttJavaSdkVer}"
     api "com.squareup.okhttp3:okhttp:3.12.2"
     api 'org.json:json:20240303'
-    api 'org.bouncycastle:bcprov-jdk15on:1.65'
-    api 'org.bouncycastle:bcpkix-jdk15on:1.65'
+    api 'org.bouncycastle:bcprov-jdk15on:1.70'
+    api 'org.bouncycastle:bcpkix-jdk15on:1.70'
     //WebSocket
     api 'org.java-websocket:Java-WebSocket:1.5.2'
     testImplementation 'junit:junit:4.13'