Skip to content

Commit 0773b1d

Browse files
mythzmythz
committed
Upgrade gson dependency to latest v2.8
1 parent 13c1683 commit 0773b1d

File tree

10 files changed

+51
-42
lines changed

10 files changed

+51
-42
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<orderEntry type="sourceFolder" forTests="false" />
107107
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
108108
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
109-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
110109
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
110+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
111111
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
112112
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
113113
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />

‎src/AndroidClient/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ install {
9595
}
9696

9797
dependencies {
98-
compile 'com.google.code.gson:gson:2.4'
98+
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
9999
compile fileTree(include: '*.jar', dir: 'libs')
100100
testCompile 'junit:junit:4.11'
101101
testCompile 'org.mockito:mockito-core:1.9.5'

‎src/AndroidClient/androidchat/androidchat.iml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,7 +85,6 @@
8485
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
@@ -104,20 +104,18 @@
104104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.1/jars" />
105105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.1/jars" />
106106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.1.1/jars" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/tweet-composer/2.3.1/jars" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/tweet-ui/2.3.1/jars" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/twitter-core/2.3.0/jars" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/twitter/2.3.1/jars" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.14/jars" />
107112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
110113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
114114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
115115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
116116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
117117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged" />
118-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
119118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
120-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
121119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
122120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
123121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -127,8 +125,11 @@
127125
</content>
128126
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
129127
<orderEntry type="sourceFolder" forTests="false" />
128+
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
130129
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
131130
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
131+
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
132+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
132133
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
133134
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
134135
<orderEntry type="library" exported="" name="design-25.1.1" level="project" />
@@ -138,17 +139,26 @@
138139
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
139140
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
140141
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
142+
<orderEntry type="library" exported="" name="tweet-ui-2.3.1" level="project" />
143+
<orderEntry type="library" exported="" name="fabric-1.3.14" level="project" />
141144
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
142145
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
146+
<orderEntry type="library" exported="" name="twitter-2.3.1" level="project" />
147+
<orderEntry type="library" exported="" name="retrofit-2.0.2" level="project" />
143148
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
144149
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
150+
<orderEntry type="library" exported="" name="converter-gson-2.0.2" level="project" />
145151
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
152+
<orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" />
146153
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
147154
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
148155
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
156+
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
149157
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
158+
<orderEntry type="library" exported="" name="tweet-composer-2.3.1" level="project" />
150159
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
151160
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
161+
<orderEntry type="library" exported="" name="twitter-core-2.3.0" level="project" />
152162
<orderEntry type="library" exported="" name="recyclerview-v7-25.1.1" level="project" />
153163
<orderEntry type="library" exported="" name="support-annotations-25.1.1" level="project" />
154164
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.1" level="project" />
@@ -157,7 +167,6 @@
157167
<orderEntry type="library" exported="" name="android-android-25" level="project" />
158168
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
159169
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
160-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
161170
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
162171
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
163172
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />

‎src/AndroidClient/app/app.iml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -108,8 +108,8 @@
108108
<orderEntry type="module" module-name="android" exported="" />
109109
<orderEntry type="library" exported="" name="android-android-23" level="project" />
110110
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
111-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
112111
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
112+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
113113
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
114114
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
115115
</component>

‎src/AndroidClient/client/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'maven'
55

66

77
dependencies {
8-
compile 'com.google.code.gson:gson:2.4'
8+
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
99
compile 'org.apache.httpcomponents:httpmime:4.2.3'
1010
testCompile 'junit:junit:4.11'
1111
testCompile 'org.mockito:mockito-core:1.9.5'

‎src/AndroidClient/client/client.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</content>
2828
<orderEntry type="inheritedJdk" />
2929
<orderEntry type="sourceFolder" forTests="false" />
30-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
30+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
3131
<orderEntry type="library" exported="" name="httpmime-4.2.3" level="project" />
3232
<orderEntry type="library" exported="" name="httpcore-4.2.2" level="project" />
3333
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />

‎src/AndroidClient/client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>com.google.code.gson</groupId>
3737
<artifactId>gson</artifactId>
38-
<version>2.4</version>
38+
<version>2.8.0</version>
3939
<scope>compile</scope>
4040
</dependency>
4141
<dependency>

‎src/AndroidClient/kotlin/kotlin.iml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,6 +76,14 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -132,7 +132,7 @@
132132
<orderEntry type="module" module-name="android" exported="" />
133133
<orderEntry type="library" exported="" name="android-android-24" level="project" />
134134
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
135-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
135+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
136136
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
137137
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
138138
</component>

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
<orderEntry type="library" exported="" name="android-android-24" level="project" />
123123
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
124124
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
125-
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
126125
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
126+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
127127
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
128128
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
129129
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />

0 commit comments

Comments
 (0)