Fix robolectric tests

square · Jan 4, 2025 · 123a0e6 · 123a0e6
1 parent 3511e1a
commit 123a0e6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 val androidBuild = property("androidBuild").toString().toBoolean()
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   namespace = "okhttp.android.test"
 
@@ -35,16 +35,16 @@ android {
   }
 
   compileOptions {
-    targetCompatibility(JavaVersion.VERSION_11)
-    sourceCompatibility(JavaVersion.VERSION_11)
+    targetCompatibility(JavaVersion.VERSION_17)
+    sourceCompatibility(JavaVersion.VERSION_17)
   }
 
   testOptions {
-    targetSdk = 34
+    targetSdk = 35
   }
 
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
   }
 
   // issue merging due to conflict with httpclient and something else

diff --git a/.../kotlin/okhttp3/android/AndroidDnsTest.kt → .../kotlin/okhttp3/android/AndroidDnsTest.kt b/.../kotlin/okhttp3/android/AndroidDnsTest.kt → .../kotlin/okhttp3/android/AndroidDnsTest.kt
diff --git a/...p3/android/AndroidNetworkSelectionTest.kt → ...p3/android/AndroidNetworkSelectionTest.kt b/...p3/android/AndroidNetworkSelectionTest.kt → ...p3/android/AndroidNetworkSelectionTest.kt
diff --git a/...n/okhttp3/android/CombinedAsyncDnsTest.kt → ...n/okhttp3/android/CombinedAsyncDnsTest.kt b/...n/okhttp3/android/CombinedAsyncDnsTest.kt → ...n/okhttp3/android/CombinedAsyncDnsTest.kt
diff --git a/...ttp3/android/RecordingAsyncDnsCallback.kt → ...ttp3/android/RecordingAsyncDnsCallback.kt b/...ttp3/android/RecordingAsyncDnsCallback.kt → ...ttp3/android/RecordingAsyncDnsCallback.kt
diff --git a/...tlin/okhttp3/android/ShadowDnsResolver.kt → ...tlin/okhttp3/android/ShadowDnsResolver.kt b/...tlin/okhttp3/android/ShadowDnsResolver.kt → ...tlin/okhttp3/android/ShadowDnsResolver.kt