Skip to content

Fix test execution on Robolectric #8822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
squarejesse merged 2 commits into from
May 29, 2025
Merged

Fix test execution on Robolectric #8822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
303e8cf
Fix test execution on Robolectric
swankjesse May 29, 2025
cb4ba34
Spotless
swankjesse May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions okhttp/src/androidMain/kotlin/okhttp3/internal/platform/AndroidPlatform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,7 @@ class AndroidPlatform :
companion object {
val Tag = "OkHttp"

val isSupported: Boolean =
when {
!isAndroid -> false
Build.VERSION.SDK_INT >= 30 -> false // graylisted methods are banned
else -> {
// Fail Fast
check(
Build.VERSION.SDK_INT >= 21,
) { "Expected Android API level 21+ but was ${Build.VERSION.SDK_INT}" }

true
}
}
val isSupported: Boolean = isAndroid && Build.VERSION.SDK_INT in 21 until 29

fun buildIfSupported(): Platform? = if (isSupported) AndroidPlatform() else null
}
Expand Down
17 changes: 16 additions & 1 deletion okhttp/src/androidMain/kotlin/okhttp3/internal/platform/PlatformRegistry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,27 @@
package okhttp3.internal.platform

import android.content.Context
import android.os.Build
import java.lang.IllegalStateException
import okhttp3.internal.platform.android.AndroidLog

actual object PlatformRegistry {
actual fun findPlatform(): Platform {
AndroidLog.enable()
return Android10Platform.buildIfSupported() ?: AndroidPlatform.buildIfSupported()!!

val androidPlatform =
Android10Platform.buildIfSupported()
?: AndroidPlatform.buildIfSupported()
if (androidPlatform != null) return androidPlatform

// If the API version is 0, assume this is the Android artifact, but running on the JVM.
// Robolectric?
if (Build.VERSION.SDK_INT == 0) {

@yschimke yschimke May 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice change

return Jdk9Platform.buildIfSupported()
?: Platform()
}

throw IllegalStateException("Expected Android API level 21+ but was ${Build.VERSION.SDK_INT}")
}

actual val isAndroid: Boolean
Expand Down
6 changes: 5 additions & 1 deletion ...okhttp3/internal/platform/Jdk9Platform.kt → ...okhttp3/internal/platform/Jdk9Platform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ import javax.net.ssl.X509TrustManager
import okhttp3.Protocol
import okhttp3.internal.SuppressSignatureCheck

/** OpenJDK 9+. */
/**
* OpenJDK 9+ and JDK8 build 252+.
*
* This may also be used for Android tests with Robolectric.
*/
open class Jdk9Platform : Platform() {
@SuppressSignatureCheck
override fun configureTlsExtensions(
Expand Down