android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-24 18:41:06 +03:00
Code Releases Activity

Fix for conscrypt tests (#5263)

Browse Source
This commit is contained in:
Yuri Schimke
2019-07-03 07:20:28 +01:00
committed by GitHub
parent 83361312e8
commit 16b7e36968
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp-testing-support/src/main/java/okhttp3/testing/PlatformRule.kt
View File

@@ -259,8 +259,7 @@ open class PlatformRule @JvmOverloads constructor(
}
@JvmStatic
fun conscrypt() = PlatformRule(
CONSCRYPT_PROPERTY)
fun conscrypt() = PlatformRule(CONSCRYPT_PROPERTY)
@JvmStatic
fun jdk9() = PlatformRule(JDK9_PROPERTY)
@@ -269,8 +268,7 @@ open class PlatformRule @JvmOverloads constructor(
fun jdk8() = PlatformRule(JDK8_PROPERTY)
@JvmStatic
fun jdk8alpn() = PlatformRule(
JDK8_ALPN_PROPERTY)
fun jdk8alpn() = PlatformRule(JDK8_ALPN_PROPERTY)
@JvmStatic
fun isAlpnBootEnabled(): Boolean = try {