Fixes

Author: yschimke

build.gradle.kts

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.utils.addExtendsFromRelation
 import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
 import java.net.URI
 
@@ -289,27 +290,37 @@ subprojects {
 
   // From https://www.liutikas.net/2025/01/12/Kotlin-Library-Friends.html
 
-  // Create configurations we can use to track friend libraries
-  val friendsApi = configurations.create("friendsApi") {
-    isCanBeResolved = true
-    isCanBeConsumed = false
-    isTransitive = true
-  }
-  val friendsImplementation = configurations.create("friendsImplementation") {
-    isCanBeResolved = true
-    isCanBeConsumed = false
-    isTransitive = false
+    // Create configurations we can use to track friend libraries
+  configurations {
+    val friendsApi = register("friendsApi") {
+      isCanBeResolved = true
+      isCanBeConsumed = false
+      isTransitive = true
+    }
+    val friendsImplementation = register("friendsImplementation") {
+      isCanBeResolved = true
+      isCanBeConsumed = false
+      isTransitive = false
+    }
+    configurations.configureEach {
+      if (name == "implementation") {
+        extendsFrom(friendsApi.get(), friendsImplementation.get())
+      }
+      if (name == "api") {
+        extendsFrom(friendsApi.get())
+      }
+    }
   }
 
-  // Make sure friends libraries are on the classpath
-  configurations.findByName("implementation")?.extendsFrom(friendsApi)
-  configurations.findByName("implementation")?.extendsFrom(friendsImplementation)
-
-  // Make these libraries friends :)
-  tasks.withType<KotlinCompile>().configureEach {
-    friendPaths.from(friendsApi.incoming.artifactView { }.files)
-    friendPaths.from(friendsImplementation.incoming.artifactView { }.files)
-  }
+    // Make these libraries friends :)
+    tasks.withType<KotlinCompile>().configureEach {
+      configurations.findByName("friendsApi")?.let {
+        friendPaths.from(it.incoming.artifactView { }.files)
+      }
+      configurations.findByName("friendsImplementation")?.let {
+        friendPaths.from(it.incoming.artifactView { }.files)
+      }
+    }
 }
 
 /** Configure publishing and signing for published Java and JavaPlatform subprojects. */

okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsOverHttps.kt

@@ -208,17 +208,18 @@ class DnsOverHttps internal constructor(
       .apply {
         val query = DnsRecordCodec.encodeQuery(hostname, type)
 
+        val dnsUrl: HttpUrl = this@DnsOverHttps.url
         if (post) {
-          url(url)
+          url(dnsUrl)
             .cacheUrlOverride(
-              url
+              dnsUrl
                 .newBuilder()
                 .addQueryParameter("hostname", hostname)
                 .build(),
             ).post(query.toRequestBody(DNS_MESSAGE))
         } else {
           val encoded = query.base64Url().replace("=", "")
-          val requestUrl = url.newBuilder().addQueryParameter("dns", encoded).build()
+          val requestUrl = dnsUrl.newBuilder().addQueryParameter("dns", encoded).build()
 
           url(requestUrl)
         }