diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 50d7219cab64..c1f7ad3ef81f 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -268,9 +268,9 @@ dependencies { compile 'com.facebook.fresco:imagepipeline-okhttp3:0.11.0' compile 'com.fasterxml.jackson.core:jackson-core:2.2.3' compile 'com.google.code.findbugs:jsr305:3.0.0' - compile 'com.squareup.okhttp3:okhttp:3.2.0' - compile 'com.squareup.okhttp3:okhttp-urlconnection:3.2.0' - compile 'com.squareup.okhttp3:okhttp-ws:3.2.0' + compile 'com.squareup.okhttp3:okhttp:3.3.1' + compile 'com.squareup.okhttp3:okhttp-urlconnection:3.3.1' + compile 'com.squareup.okhttp3:okhttp-ws:3.3.1' compile 'com.squareup.okio:okio:1.8.0' compile 'org.webkit:android-jsc:r174650' diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 2d5dd3a7f8d0..1d8131544e76 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -9,6 +9,6 @@ android.useDeprecatedNdk=true MOCKITO_CORE_VERSION=1.+ POWERMOCK_VERSION=1.6.2 -ROBOLECTRIC_VERSION=3.0 +ROBOLECTRIC_VERSION=3.1 JUNIT_VERSION=4.12 FEST_ASSERT_CORE_VERSION=2.0M10 diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK index 07d870bdbbe5..44d22df1a6c1 100644 --- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK +++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK @@ -6,8 +6,8 @@ prebuilt_jar( remote_file( name = 'okhttp3-binary-jar', - url = 'mvn:com.squareup.okhttp3:okhttp:jar:3.2.0', - sha1 = 'f7873a2ebde246a45c2a8d6f3247108b4c88a879' + url = 'mvn:com.squareup.okhttp3:okhttp:jar:3.3.1', + sha1 = '19047bdb6a4fc00a44124f64ca98e88fc204e7e3' ) prebuilt_jar( @@ -18,8 +18,8 @@ prebuilt_jar( remote_file( name = 'okhttp3-urlconnection-binary-jar', - url = 'mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.2.0', - sha1 = '6f8a4b1435c9e0a6f9c5fe4a1be46627b848fd0c' + url = 'mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.3.1', + sha1 = '14e70f2069fb98dc60346dd24cb7b6a2e321580d' ) prebuilt_jar( @@ -30,6 +30,6 @@ prebuilt_jar( remote_file( name = 'okhttp3-ws-binary-jar', - url = 'mvn:com.squareup.okhttp3:okhttp-ws:jar:3.2.0', - sha1 = '1ea229d6984444c8c58b8e97ba4c8429d9d135b3', + url = 'mvn:com.squareup.okhttp3:okhttp-ws:jar:3.3.1', + sha1 = 'ebca9fdfbef870042a19aec6a5b7a21d72639310', ) diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index 1f5d94f7670a..a3f7f0ab76fe 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -10,10 +10,8 @@ android_library( ':bouncycastle', ':vtd-xml', ':icu', - ':android-all-4.1.2_r1-robolectric-0', - ':json-20080701', - ':tagsoup-1.2', - ':shadows-core-3.0-16', + ':shadows-core-3.1-16', + ':guava', react_native_dep('third-party/java/asm:asm'), react_native_dep('third-party/java/sqlite:sqlite'), ], @@ -28,8 +26,8 @@ prebuilt_jar( remote_file( name = 'robolectric-binary-jar', - url = 'mvn:org.robolectric:robolectric:jar:3.0', - sha1 = 'f888cea3bc1a24110e315eb9827ab593610ea62f', + url = 'mvn:org.robolectric:robolectric:jar:3.1', + sha1 = '5bd3814a085d17ac05e01c6cda6eae8c1bf084a5', ) prebuilt_jar( @@ -40,8 +38,8 @@ prebuilt_jar( remote_file( name = 'robolectric-resources-binary-jar', - url = 'mvn:org.robolectric:robolectric-resources:jar:3.0', - sha1 = '1ab609054aab67cd13a434567467f4b4774f2465', + url = 'mvn:org.robolectric:robolectric-resources:jar:3.1', + sha1 = '5edc9fd9d4635286d8f8364fdd955fe83740be6f', ) prebuilt_jar( @@ -52,8 +50,8 @@ prebuilt_jar( remote_file( name = 'robolectric-annotations-binary-jar', - url = 'mvn:org.robolectric:robolectric-annotations:jar:3.0', - sha1 = '2a6cfc072d7680694c1ff893c5dc8fec33163110', + url = 'mvn:org.robolectric:robolectric-annotations:jar:3.1', + sha1 = '027ae8d151de5b8156abf7fdcbc4d99278165539', ) prebuilt_jar( @@ -64,8 +62,8 @@ prebuilt_jar( remote_file( name = 'robolectric-utils-binary-jar', - url = 'mvn:org.robolectric:robolectric-utils:jar:3.0', - sha1 = '4bcecd8115fe7296088bb1636e6cbd7ae8927392', + url = 'mvn:org.robolectric:robolectric-utils:jar:3.1', + sha1 = 'cf88814124fc1ea76a2d98858d72ec3831ab8501', ) prebuilt_jar( @@ -105,49 +103,25 @@ remote_file( ) prebuilt_jar( - name = 'android-all-4.1.2_r1-robolectric-0', # name defines filename used by robolectric in runtime - binary_jar = ':robolectric-android-all-binary-jar', - visibility = ['//ReactAndroid/...',], -) - -remote_file( - name = 'robolectric-android-all-binary-jar', - url = 'mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-0', - sha1 = 'aecc8ce5119a25fcea1cdf8285469c9d1261a352', -) - -prebuilt_jar( - name = 'json-20080701', # name defines filename used by robolectric in runtime - binary_jar = ':json-jar', - visibility = ['//ReactAndroid/...',], -) - -remote_file( - name = 'json-jar', - url = 'mvn:org.json:json:jar:20080701', - sha1 = 'd652f102185530c93b66158b1859f35d45687258', -) - -prebuilt_jar( - name = 'tagsoup-1.2', # name defines filename used by robolectric in runtime - binary_jar = ':tagsoup-jar', + name = 'shadows-core-3.1-16', # name defines filename used by robolectric in runtime + binary_jar = ':robolectric-shadows-binary-jar', visibility = ['//ReactAndroid/...',], ) remote_file( - name = 'tagsoup-jar', - url = 'mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2', - sha1 = '639fd364750d7363c85797dc944b4a80f78fa684', + name = 'robolectric-shadows-binary-jar', + url = 'https://repo1.maven.org/maven2/org/robolectric/shadows-core/3.1/shadows-core-3.1-16.jar', + sha1 = 'be705b09ca8a1e9f13965c24522fcaa8613c10ab', ) prebuilt_jar( - name = 'shadows-core-3.0-16', # name defines filename used by robolectric in runtime - binary_jar = ':robolectric-shadows-binary-jar', + name = 'guava', # name defines filename used by robolectric in runtime + binary_jar = ':guava-binary-jar', visibility = ['//ReactAndroid/...',], ) remote_file( - name = 'robolectric-shadows-binary-jar', - url = 'https://repo1.maven.org/maven2/org/robolectric/shadows-core/3.0/shadows-core-3.0-16.jar', - sha1 = '39d7a856bf91640b1a6d044333336a2b3f3c198f', + name = 'guava-binary-jar', + url = 'mvn:com.google.guava:guava:jar:19.0-rc2', + sha1 = '93e17f60bc524c2610b41c494bb829c11ca89436', )