From b6d80a76f0e8bcb6c3054873f3b4d7b7b69d8630 Mon Sep 17 00:00:00 2001
From: liujingxing <327744707@qq.com>
Date: Thu, 24 Jun 2021 16:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4rxhttp=5Fnext=5Fversion?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle    | 20 ++++++++++----------
 gradle.properties   |  3 +--
 rxhttp/build.gradle |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac3549f9..df9d2b8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,17 +73,17 @@ dependencies {
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
     implementation 'io.reactivex.rxjava3:rxjava:3.0.13'
 
-    implementation "com.github.liujingxing.rxhttp:converter-fastjson:${rxhttp_version}"
-    implementation "com.github.liujingxing.rxhttp:converter-jackson:${rxhttp_version}"
-    implementation "com.github.liujingxing.rxhttp:converter-moshi:${rxhttp_version}"
-    implementation "com.github.liujingxing.rxhttp:converter-protobuf:${rxhttp_version}"
-    implementation "com.github.liujingxing.rxhttp:converter-simplexml:${rxhttp_version}"
+//    implementation "com.github.liujingxing.rxhttp:converter-fastjson:${rxhttp_version}"
+//    implementation "com.github.liujingxing.rxhttp:converter-jackson:${rxhttp_version}"
+//    implementation "com.github.liujingxing.rxhttp:converter-moshi:${rxhttp_version}"
+//    implementation "com.github.liujingxing.rxhttp:converter-protobuf:${rxhttp_version}"
+//    implementation "com.github.liujingxing.rxhttp:converter-simplexml:${rxhttp_version}"
 
-//    implementation project(':rxhttp-converter:converter-fastjson')
-//    implementation project(':rxhttp-converter:converter-simplexml')
-//    implementation project(':rxhttp-converter:converter-protobuf')
-//    implementation project(':rxhttp-converter:converter-moshi')
-//    implementation project(':rxhttp-converter:converter-jackson')
+    implementation project(':rxhttp-converter:converter-fastjson')
+    implementation project(':rxhttp-converter:converter-simplexml')
+    implementation project(':rxhttp-converter:converter-protobuf')
+    implementation project(':rxhttp-converter:converter-moshi')
+    implementation project(':rxhttp-converter:converter-jackson')
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/gradle.properties b/gradle.properties
index ed543e9b..14e2e90b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,8 +19,7 @@ org.gradle.jvmargs=-Xmx1536m
 
 okhttp_version=4.9.1
 rxlife_version=2.1.0
-rxhttp_version=2.6.2
-rxhttp_next_version=2.6.3
+rxhttp_version=2.6.3
 
 fastjson_version=1.2.76
 jackson_version=2.12.3
diff --git a/rxhttp/build.gradle b/rxhttp/build.gradle
index 2217cac7..ec3f08a8 100644
--- a/rxhttp/build.gradle
+++ b/rxhttp/build.gradle
@@ -16,7 +16,7 @@ compileKotlin {
 task copyJavaTemplates(type: Copy) {
     from 'src/main/java-templates'
     into "$buildDir/generated/sources/java-templates/java/main"
-    expand('projectVersion': "${rxhttp_next_version}")
+    expand('projectVersion': "${rxhttp_version}")
     filteringCharset = 'UTF-8'
 }