Skip to content

Commit 3c68f2a

Browse files
troutslapstroutslaps
committed
updated okhttp
1 parent 4abcc0e commit 3c68f2a

3 files changed

Lines changed: 15 additions & 20 deletions

File tree

‎.idea/misc.xml‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaPhoenixChannels.iml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<output-test url="file://$MODULE_DIR$/build/classes/test" />
1919
<exclude-output />
2020
<content url="file://$MODULE_DIR$">
21-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
2221
<sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
22+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
2323
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
2424
<sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
2525
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -30,26 +30,24 @@
3030
<orderEntry type="inheritedJdk" />
3131
<orderEntry type="sourceFolder" forTests="false" />
3232
<orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
33-
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.22" level="project" />
34-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.6.0" level="project" />
35-
<orderEntry type="library" name="Gradle: com.squareup.okhttp:okhttp:2.7.2" level="project" />
36-
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.3" level="project" />
37-
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.5.0" level="project" />
38-
<orderEntry type="library" name="Gradle: com.squareup.okhttp:okhttp-ws:2.7.2" level="project" />
39-
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.5.3" level="project" />
40-
<orderEntry type="library" scope="TEST" name="Gradle: org.spockframework:spock-core:1.0-groovy-2.3" level="project" />
41-
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
42-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
43-
<orderEntry type="library" scope="TEST" name="Gradle: cglib:cglib-nodep:3.1" level="project" />
33+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0" level="project" />
34+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
4435
<orderEntry type="library" name="Gradle: org.codehaus.groovy:groovy-all:2.3.10" level="project" />
36+
<orderEntry type="library" scope="TEST" name="Gradle: cglib:cglib-nodep:3.1" level="project" />
37+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
38+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
39+
<orderEntry type="library" scope="TEST" name="Gradle: org.spockframework:spock-core:1.0-groovy-2.3" level="project" />
40+
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.5.3" level="project" />
41+
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.5.0" level="project" />
42+
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.3" level="project" />
43+
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.22" level="project" />
4544
<orderEntry type="library" exported="" name="jackson-databind-2.5.3" level="project" />
46-
<orderEntry type="library" exported="" name="okhttp-ws-2.7.2" level="project" />
45+
<orderEntry type="library" exported="" name="okhttp-3.10.0" level="project" />
4746
<orderEntry type="library" exported="" name="slf4j-api-1.7.22" level="project" />
4847
<orderEntry type="library" exported="" name="groovy-all-2.3.10" level="project" />
4948
<orderEntry type="library" exported="" name="jackson-annotations-2.5.0" level="project" />
5049
<orderEntry type="library" exported="" name="jackson-core-2.5.3" level="project" />
51-
<orderEntry type="library" exported="" name="okhttp-2.7.2" level="project" />
52-
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
50+
<orderEntry type="library" exported="" name="okio-1.14.0" level="project" />
5351
<orderEntry type="library" exported="" scope="TEST" name="spock-core-1.0-groovy-2.3" level="project" />
5452
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
5553
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sourceCompatibility = '1.7.0'
1111
dependencies {
1212
compile fileTree(dir: 'libs', include: ['*.jar'])
1313
compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
14-
compile 'com.squareup.okhttp:okhttp-ws:2.7.2'
14+
compile 'com.squareup.okhttp3:okhttp:3.10.0'
1515
compile 'org.slf4j:slf4j-api:1.7.22'
1616
testCompile 'org.codehaus.groovy:groovy-all:2.3.10'
1717
testCompile "org.spockframework:spock-core:1.0-groovy-2.3"

0 commit comments

Comments
 (0)