Skip to content

Commit

Permalink
bump okio to 1.17.5 (#30204)
Browse files Browse the repository at this point in the history
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: #30204

Test Plan: RNTester builds and runs as expected.

Reviewed By: hramos

Differential Revision: D24560711

Pulled By: fkgozali

fbshipit-source-id: 433075293ca2dc41869dbb272d674625639c8b83
  • Loading branch information
dulmandakh authored and facebook-github-bot committed Oct 27, 2020
1 parent d50a425 commit 1e78e06
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"]))
Expand Down
2 changes: 0 additions & 2 deletions ReactAndroid/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,4 +22,3 @@ GLOG_VERSION=0.3.5

android.useAndroidX=true
android.enableJetifier=true
android.enableR8=false
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/third-party/java/okio/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

0 comments on commit 1e78e06

Please sign in to comment.