整理代码

andnux · Sep 26, 2019 · 7fd983d · 7fd983d
1 parent ebf390f
commit 7fd983d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 36 deletions.
diff --git a/.idea/libraries/Gradle__bouncycastle_bcprov_jdk14_140_jar.xml b/.idea/libraries/Gradle__bouncycastle_bcprov_jdk14_140_jar.xml
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_6_1_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_6_1_jar.xml
diff --git a/app/app.iml b/app/app.iml
@@ -115,7 +115,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-simplexml:2.6.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-protobuf:2.6.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.6.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.2.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50@jar" level="project" />
@@ -124,7 +124,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
-    <orderEntry type="library" name="Gradle: bouncycastle:bcprov-jdk14:140@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.bouncycastle:bcprov-jdk15to18:1.63@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.aspectj:aspectjrt:1.9.4@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.simpleframework:simple-xml:2.7.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: stax:stax:1.2.0@jar" level="project" />

diff --git a/json/build.gradle b/json/build.gradle
@@ -24,7 +24,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.squareup.retrofit2:retrofit:2.6.1'
+    api 'com.squareup.retrofit2:retrofit:2.6.2'
     api 'com.alibaba:fastjson:1.2.61'
     api 'com.google.code.gson:gson:2.8.5'
     api 'androidx.appcompat:appcompat:1.1.0'

diff --git a/json/json.iml b/json/json.iml
@@ -32,7 +32,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.6.1/e09f83ea4eddf07fc956778dbda3c2d2b0b3ce7f/retrofit-2.6.1.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.2.61/2be84d3199e5b7c37948f0c248377a649ecffaf2/fastjson-1.2.61.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/17d694f975ba5df7ec76f74f15e4421f/appcompat-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/6fa07088e7b2c076c4456fb0df7566f2/fragment-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/08be14b181bef7d1d67209aafc07a2fd/appcompat-resources-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fafd1445e55e5fd9e28f688fea934ad3/drawerlayout-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ef63ca3021a927b3652661d99c90b71d/viewpager-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b784c295ba245db47d8d555affba7077/loader-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/be587c0258eed674cda51f1f990ec6b4/activity-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/20b5494ded592f13f31282847393ef27/vectordrawable-animated-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/f6e3b60d161c96d703076b3d6eea0c88/vectordrawable-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/639b11dcceab40b6104d18b5338e604a/customview-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/20066b1960820fc57437dd6a58297a2c/core-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fcdf6544945932c8a8581c8b0ba57e47/cursoradapter-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c3191f539174b08d6b77892ebb2a2997/versionedparcelable-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ac060158d3a08c8d63d50eb82afe7c93/lifecycle-viewmodel-2.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/cd6102a52804cb6808cdf1ce57fb07d9/lifecycle-runtime-2.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/47175ae062284d04fce4353623981559/savedstate-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/90fc0f45c619502eb6efc74aa18e0666/lifecycle-livedata-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/3c49a553b8bfa0ffccba9eceab438500/lifecycle-livedata-core-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/bc4867e191ea9a8fab8a19a595725b59/interpolator-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/acf78d3342737f4064d75569c88bea2a/core-runtime-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.50/bec16087637a7cafe54894e73d38037977cb30d2/kotlin-android-extensions-runtime-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/Administrator/Desktop/github/sdk/json/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar;D:/Android/sdk/platforms/android-29/android.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.6.2/b51e9cf3b25a2f4116612d368d1aeba671fe1533/retrofit-2.6.2.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.2.61/2be84d3199e5b7c37948f0c248377a649ecffaf2/fastjson-1.2.61.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/17d694f975ba5df7ec76f74f15e4421f/appcompat-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/6fa07088e7b2c076c4456fb0df7566f2/fragment-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/08be14b181bef7d1d67209aafc07a2fd/appcompat-resources-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fafd1445e55e5fd9e28f688fea934ad3/drawerlayout-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ef63ca3021a927b3652661d99c90b71d/viewpager-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b784c295ba245db47d8d555affba7077/loader-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/be587c0258eed674cda51f1f990ec6b4/activity-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/20b5494ded592f13f31282847393ef27/vectordrawable-animated-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/f6e3b60d161c96d703076b3d6eea0c88/vectordrawable-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/639b11dcceab40b6104d18b5338e604a/customview-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/20066b1960820fc57437dd6a58297a2c/core-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fcdf6544945932c8a8581c8b0ba57e47/cursoradapter-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c3191f539174b08d6b77892ebb2a2997/versionedparcelable-1.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ac060158d3a08c8d63d50eb82afe7c93/lifecycle-viewmodel-2.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/cd6102a52804cb6808cdf1ce57fb07d9/lifecycle-runtime-2.1.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/47175ae062284d04fce4353623981559/savedstate-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/90fc0f45c619502eb6efc74aa18e0666/lifecycle-livedata-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/3c49a553b8bfa0ffccba9eceab438500/lifecycle-livedata-core-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/bc4867e191ea9a8fab8a19a595725b59/interpolator-1.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/acf78d3342737f4064d75569c88bea2a/core-runtime-2.0.0/jars/classes.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.50/bec16087637a7cafe54894e73d38037977cb30d2/kotlin-android-extensions-runtime-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/Administrator/Desktop/github/sdk/json/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar;D:/Android/sdk/platforms/android-29/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="json_debug" />
@@ -141,7 +141,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.0@jar" level="project" />