Skip to content

Commit 1e78e06

Browse files
dulmandakhfacebook-github-bot
authored andcommitted
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: #30204 Test Plan: RNTester builds and runs as expected. Reviewed By: hramos Differential Revision: D24560711 Pulled By: fkgozali fbshipit-source-id: 433075293ca2dc41869dbb272d674625639c8b83
1 parent d50a425 commit 1e78e06

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

ReactAndroid/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ dependencies {
451451
api("com.google.code.findbugs:jsr305:3.0.2")
452452
api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
453453
api("com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}")
454-
api("com.squareup.okio:okio:1.15.0")
454+
api("com.squareup.okio:okio:1.17.5")
455455
api("com.facebook.fbjni:fbjni-java-only:0.0.3")
456456
extractHeaders("com.facebook.fbjni:fbjni:0.0.2:headers")
457457
extractJNI("com.facebook.fbjni:fbjni:0.0.2")
@@ -461,7 +461,7 @@ dependencies {
461461
testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
462462
testImplementation("org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}")
463463
testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
464-
testImplementation("org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}")
464+
testImplementation("org.easytesting:fest-assert-core:2.0M10")
465465
testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}")
466466

467467
androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"]))

ReactAndroid/gradle.properties

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ MOCKITO_CORE_VERSION=2.26.0
99
POWERMOCK_VERSION=2.0.2
1010
ROBOLECTRIC_VERSION=4.4
1111
JUNIT_VERSION=4.12
12-
FEST_ASSERT_CORE_VERSION=2.0M10
1312

1413
ANDROIDX_TEST_VERSION=1.1.0
1514
FRESCO_VERSION=2.0.0
@@ -23,4 +22,3 @@ GLOG_VERSION=0.3.5
2322

2423
android.useAndroidX=true
2524
android.enableJetifier=true
26-
android.enableR8=false

ReactAndroid/src/main/third-party/java/okio/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ rn_prebuilt_jar(
99

1010
fb_native.remote_file(
1111
name = "okio-binary.jar",
12-
sha1 = "bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8",
13-
url = "mvn:com.squareup.okio:okio:jar:1.15.0",
12+
sha1 = "34336f82f14dde1c0752fd5f0546dbf3c3225aba",
13+
url = "mvn:com.squareup.okio:okio:jar:1.17.5",
1414
)

0 commit comments

Comments
 (0)