Updating okhttp3 library to 4.0.1 (#7414)

Closes #7373
SeleniumHQ · Jul 22, 2019 · d8e434f · d8e434f
1 parent 565006f
commit d8e434f
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 19 deletions.
diff --git a/.idea/libraries/okhttp.xml b/.idea/libraries/okhttp.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/third_party/java/kotlin-stdlib/BUCK b/third_party/java/kotlin-stdlib/BUCK
@@ -0,0 +1,9 @@
+prebuilt_jar(
+    name = "kotlin-stdlib",
+    maven_coords = "org.jetbrains.kotlin:kotlin-stdlib:jar:1.3.41",
+    binary_jar = "kotlin-stdlib-1.3.41.jar",
+    source_jar = "kotlin-stdlib-1.3.41-sources.jar",
+    visibility = [
+        "//third_party/java/okio:okio",
+    ],
+)
diff --git a/third_party/java/kotlin-stdlib/BUILD.bazel b/third_party/java/kotlin-stdlib/BUILD.bazel
@@ -0,0 +1,12 @@
+load("//third_party/java:rules.bzl", "maven_java_import")
+
+licenses(["notice"])
+
+package(default_visibility = ["//visibility:public"])
+
+maven_java_import(
+    name = "kotlin-stdlib",
+    coords = "org.jetbrains.kotlin:kotlin-stdlib:jar:1.3.41",
+    jar = "kotlin-stdlib-1.3.41.jar",
+    srcjar = "kotlin.stdlib-1.3.41-sources.jar",
+)
diff --git a/third_party/java/kotlin-stdlib/kotlin-stdlib-1.3.41-sources.jar b/third_party/java/kotlin-stdlib/kotlin-stdlib-1.3.41-sources.jar
diff --git a/third_party/java/kotlin-stdlib/kotlin-stdlib-1.3.41.jar b/third_party/java/kotlin-stdlib/kotlin-stdlib-1.3.41.jar
diff --git a/third_party/java/okhttp3/BUCK b/third_party/java/okhttp3/BUCK
@@ -1,8 +1,8 @@
 prebuilt_jar(
     name = "okhttp",
-    maven_coords = "com.squareup.okhttp3:okhttp:jar:3.14.0",
-    binary_jar = "okhttp-3.14.0.jar",
-    source_jar = "okhttp-3.14.0-sources.jar",
+    maven_coords = "com.squareup.okhttp3:okhttp:jar:4.0.1",
+    binary_jar = "okhttp-4.0.1.jar",
+    source_jar = "okhttp-4.0.1-sources.jar",
     deps = [
         "//third_party/java/okio:okio",
     ],

diff --git a/third_party/java/okhttp3/BUILD.bazel b/third_party/java/okhttp3/BUILD.bazel
@@ -6,9 +6,9 @@ package(default_visibility = ["//visibility:public"])
 
 maven_java_import(
     name = "okhttp",
-    coords = "com.squareup.okhttp3:okhttp:jar:3.14.0",
-    jar = "okhttp-3.14.0.jar",
-    srcjar = "okhttp-3.14.0-sources.jar",
+    coords = "com.squareup.okhttp3:okhttp:jar:4.0.1",
+    jar = "okhttp-4.0.1.jar",
+    srcjar = "okhttp-4.0.1-sources.jar",
     deps = [
         "//third_party/java/okio",
     ],

diff --git a/third_party/java/okhttp3/okhttp-3.14.0-sources.jar b/third_party/java/okhttp3/okhttp-3.14.0-sources.jar
diff --git a/third_party/java/okhttp3/okhttp-3.14.0.jar b/third_party/java/okhttp3/okhttp-3.14.0.jar
diff --git a/third_party/java/okhttp3/okhttp-4.0.1-sources.jar b/third_party/java/okhttp3/okhttp-4.0.1-sources.jar
diff --git a/third_party/java/okhttp3/okhttp-4.0.1.jar b/third_party/java/okhttp3/okhttp-4.0.1.jar
diff --git a/third_party/java/okio/BUCK b/third_party/java/okio/BUCK
@@ -1,8 +1,11 @@
 prebuilt_jar(
     name = "okio",
-    maven_coords = "com.squareup.okio:okio:jar:1.17.3",
-    binary_jar = "okio-1.17.3.jar",
-    source_jar = "okio-1.17.3-sources.jar",
+    maven_coords = "com.squareup.okio:okio:jar:2.2.2",
+    binary_jar = "okio-2.2.2.jar",
+    source_jar = "okio-2.2.2-sources.jar",
+    deps = [
+        "//third_party/java/kotlin-stdlib:kotlin-stdlib",
+    ],
     visibility = [
         "//third_party/java/okhttp3:okhttp",
     ],

diff --git a/third_party/java/okio/BUILD.bazel b/third_party/java/okio/BUILD.bazel
@@ -6,7 +6,10 @@ package(default_visibility = ["//visibility:public"])
 
 maven_java_import(
     name = "okio",
-    coords = "com.squareup.okio:okio:jar:1.17.3",
-    jar = "okio-1.17.3.jar",
-    srcjar = "okio-1.17.3-sources.jar",
+    coords = "com.squareup.okio:okio:jar:2.2.2",
+    jar = "okio-2.2.2.jar",
+    srcjar = "okio-2.2.2-sources.jar",
+    deps = [
+        "//third_party/java/kotlin-stdlib",
+    ],
 )
diff --git a/third_party/java/okio/okio-1.17.3-sources.jar b/third_party/java/okio/okio-1.17.3-sources.jar
diff --git a/third_party/java/okio/okio-1.17.3.jar b/third_party/java/okio/okio-1.17.3.jar
diff --git a/third_party/java/okio/okio-2.2.2-sources.jar b/third_party/java/okio/okio-2.2.2-sources.jar
diff --git a/third_party/java/okio/okio-2.2.2.jar b/third_party/java/okio/okio-2.2.2.jar