Skip to content

Commit 6cfc4a0

Browse files
Jawnnypoorogerhu
authored andcommitted
OkHttp Builder Exposed for REST and AWS (#628)
* Update some dependencies * Direct access to ParseOkHttpClient since it is the only one * ParseOkHttpClient becomes ParseHttpClient * Remove ParseNetworkInterceptor in favor of OkHttp interceptors * Modify tests that need Plugin teardown to do so to prevent random tests from failing * Joint support library version * Add back in checkinit * Remove AWS client builder (build the http builder instead). AWS -> File * Fix ParseFileRequestTest * Reset in between test cases in ParseCloudTest * Add plugin resetting to both the setup and tear down of tests
1 parent 38b1e29 commit 6cfc4a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+610
-1417
lines changed

Parse/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,22 @@ android {
3939
}
4040
}
4141

42-
ext.okhttpVersion = '3.6.0'
42+
ext {
43+
okhttpVersion = '3.6.0'
44+
}
45+
4346
dependencies {
47+
compile "com.android.support:support-annotations:$supportLibVersion"
4448
compile 'com.parse.bolts:bolts-tasks:1.4.0'
4549
compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
4650
provided 'com.facebook.stetho:stetho:1.4.2'
4751

52+
//Be aware, tests fail on 3.3.2 Wait to update until
53+
//java.lang.NoClassDefFoundError: android/content/pm/VersionedPackage
54+
//issue is fixed in Robolectric
55+
//https://github.com/robolectric/robolectric/issues/2562
4856
testCompile 'org.robolectric:robolectric:3.3'
49-
testCompile 'org.skyscreamer:jsonassert:1.4.0'
57+
testCompile 'org.skyscreamer:jsonassert:1.5.0'
5058
testCompile 'org.mockito:mockito-core:1.10.19'
5159
testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
5260
}

0 commit comments

Comments
 (0)