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' }