Skip to content

Commit baaf51a

Browse files
mythzmythz
committed
upgrade deps
1 parent 3676c28 commit baaf51a

File tree

14 files changed

+135
-70
lines changed

14 files changed

+135
-70
lines changed

‎src/AndroidClient/.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎src/AndroidClient/android/android.iml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/debug" />
2121
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2222
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2323
<option name="PROJECT_TYPE" value="1" />
@@ -30,15 +30,15 @@
3030
<exclude-output />
3131
<content url="file://$MODULE_DIR$">
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -93,19 +93,27 @@
9393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9697
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_library_classes" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
97100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/full_jar" />
98102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
99103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
100104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
101105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
102106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
103107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
104108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
105111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
106112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
107113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
108115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
116+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
109117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
110118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
111119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
@@ -114,6 +122,7 @@
114122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/publish-proguard" />
115123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
116124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
125+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/runtime_library_classes" />
117126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
118127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
119128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -127,11 +136,11 @@
127136
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
128137
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
129138
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
139+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
130140
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
131141
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
132142
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
133143
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
134-
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
135144
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
136145
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
137146
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />

‎src/AndroidClient/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
55
version = "1.0.35"
66

77
dependencies {
8-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
8+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
99
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
1010
implementation fileTree(include: '*.jar', dir: 'libs')
1111
androidTestImplementation 'junit:junit:4.12'

‎src/AndroidClient/androidchat/androidchat.iml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/fabric/res/debug;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/fabric/res/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
2121
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2222
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2323
</configuration>
@@ -29,16 +29,16 @@
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -90,12 +90,16 @@
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9495
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
98101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
99103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
100104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
101105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
@@ -104,17 +108,22 @@
104108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
105109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
106110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
107112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
108115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
109116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
110117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
111118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
113120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
121+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
114122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
115123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
116124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
117125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
118127
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
119128
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
120129
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -134,7 +143,6 @@
134143
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
135144
<orderEntry type="library" name="Gradle: com.google.zxing:core:3.3.0@jar" level="project" />
136145
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.0.2@jar" level="project" />
137-
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.2.0@jar" level="project" />
138146
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
139147
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
140148
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
@@ -146,6 +154,7 @@
146154
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-places:4.31.0@aar" level="project" />
147155
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
148156
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-core:4.31.0@aar" level="project" />
157+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
149158
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
150159
<orderEntry type="library" name="Gradle: com.twitter.sdk.android:tweet-ui:2.3.1@aar" level="project" />
151160
<orderEntry type="library" name="Gradle: com.twitter.sdk.android:twitter-core:2.3.0@aar" level="project" />
@@ -154,7 +163,6 @@
154163
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
155164
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
156165
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.0.2@jar" level="project" />
157-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.6.0@jar" level="project" />
158166
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
159167
<orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
160168
<orderEntry type="library" name="Gradle: com.twitter.sdk.android:tweet-composer:2.3.1@aar" level="project" />
@@ -166,6 +174,7 @@
166174
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-share:4.31.0@aar" level="project" />
167175
<orderEntry type="library" name="Gradle: com.twitter:twitter-text:1.13.0@jar" level="project" />
168176
<orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
177+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
169178
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-android:1.4.0@jar" level="project" />
170179
<orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
171180
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-common:4.31.0@aar" level="project" />
@@ -175,7 +184,6 @@
175184
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-applinks:1.4.0@jar" level="project" />
176185
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
177186
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
178-
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.6.1@jar" level="project" />
179187
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
180188
<orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
181189
<orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
@@ -187,6 +195,7 @@
187195
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
188196
<orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
189197
<orderEntry type="library" name="Gradle: com.android.support:customtabs:27.0.2@aar" level="project" />
198+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
190199
<orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.2@jar" level="project" />
191200
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
192201
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />

‎src/AndroidClient/androidchat/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212

1313
// We recommend changing it to the latest version from our changelog:
1414
// https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin
15-
classpath 'io.fabric.tools:gradle:1.25.4'
15+
classpath 'io.fabric.tools:gradle:1.28.0'
1616
}
1717
}
1818

0 commit comments

Comments
 (0)