From 1e78e0655d53ac947f523bcadf9c5339ab07bbb8 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 27 Oct 2020 12:10:39 -0700 Subject: [PATCH] bump okio to 1.17.5 (#30204) Summary: Bump Okio to 1.17.5, which includes fixes for many bugs and crashes since current version. Also removed android.enableR8=false from gradle.properties because it's deprecated. And moved FEST_ASSERT_CORE_VERSION from gradle.properties to build.gradle because it's used in single line. ## Changelog [Android] [Changed] - bump Okio to 1.17.5 Pull Request resolved: https://github.com/facebook/react-native/pull/30204 Test Plan: RNTester builds and runs as expected. Reviewed By: hramos Differential Revision: D24560711 Pulled By: fkgozali fbshipit-source-id: 433075293ca2dc41869dbb272d674625639c8b83 --- ReactAndroid/build.gradle | 4 ++-- ReactAndroid/gradle.properties | 2 -- ReactAndroid/src/main/third-party/java/okio/BUCK | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 345c6958381e84..70c245c1fd5f21 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -451,7 +451,7 @@ dependencies { api("com.google.code.findbugs:jsr305:3.0.2") api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}") api("com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}") - api("com.squareup.okio:okio:1.15.0") + api("com.squareup.okio:okio:1.17.5") api("com.facebook.fbjni:fbjni-java-only:0.0.3") extractHeaders("com.facebook.fbjni:fbjni:0.0.2:headers") extractJNI("com.facebook.fbjni:fbjni:0.0.2") @@ -461,7 +461,7 @@ dependencies { testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}") testImplementation("org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}") testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}") - testImplementation("org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}") + testImplementation("org.easytesting:fest-assert-core:2.0M10") testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}") androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"])) diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 766e22770f7b6c..2287cd057099fc 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -9,7 +9,6 @@ MOCKITO_CORE_VERSION=2.26.0 POWERMOCK_VERSION=2.0.2 ROBOLECTRIC_VERSION=4.4 JUNIT_VERSION=4.12 -FEST_ASSERT_CORE_VERSION=2.0M10 ANDROIDX_TEST_VERSION=1.1.0 FRESCO_VERSION=2.0.0 @@ -23,4 +22,3 @@ GLOG_VERSION=0.3.5 android.useAndroidX=true android.enableJetifier=true -android.enableR8=false diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK index e244efaa9aca28..e62ba43e228b15 100644 --- a/ReactAndroid/src/main/third-party/java/okio/BUCK +++ b/ReactAndroid/src/main/third-party/java/okio/BUCK @@ -9,6 +9,6 @@ rn_prebuilt_jar( fb_native.remote_file( name = "okio-binary.jar", - sha1 = "bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8", - url = "mvn:com.squareup.okio:okio:jar:1.15.0", + sha1 = "34336f82f14dde1c0752fd5f0546dbf3c3225aba", + url = "mvn:com.squareup.okio:okio:jar:1.17.5", )