Skip to content
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

Create a friends configuration to use internals. #8651

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

Create a friends configuration to use internals. #8651

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0e87181
Create a friends configuration to use internals.
yschimke Jan 17, 2025
de7ebb4
missing dependency
yschimke Jan 17, 2025
30faa0c
workaround issue
yschimke Jan 17, 2025
99dbbcb
workaround issue
yschimke Jan 17, 2025
811d0e4
fix dependencies
yschimke Jan 17, 2025
483aeb1
simplify
yschimke Jan 17, 2025
8f291d6
fix deps
yschimke Jan 17, 2025
5bc14b7
fix deps
yschimke Jan 17, 2025
023ca18
revert one
yschimke Jan 17, 2025
25b4ec6
fix url reference
yschimke Jan 17, 2025
5b0e466
fix url reference
yschimke Jan 17, 2025
611fe3f
more friends the merrier
yschimke Jan 18, 2025
73324c5
more cases
yschimke Jan 18, 2025
26d41ec
Merge branch 'master' into whycantwebefriends
yschimke Feb 1, 2025
d73f8cc
split to api and implementation
yschimke Feb 1, 2025
637f30c
update api
yschimke Feb 1, 2025
3438240
add test dependencies
yschimke Feb 1, 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
1 change: 1 addition & 0 deletions android-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ dependencies {
implementation(libs.kotlin.reflect)
implementation(libs.playservices.safetynet)
implementation(projects.okhttp)
"friends"(projects.okhttpDnsoverhttps)

testImplementation(libs.junit)
testImplementation(libs.junit.ktx)
Expand Down
18 changes: 18 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.tasks.KotlinJvmCompile
import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
import java.net.URI

Expand Down Expand Up @@ -279,6 +280,23 @@ subprojects {
languageSettings.optIn("okhttp3.ExperimentalOkHttpApi")
}
}

// From https://www.liutikas.net/2025/01/12/Kotlin-Library-Friends.html

// Create a configuration we can use to track friend libraries
val friends = configurations.create("friends") {
isCanBeResolved = true
isCanBeConsumed = false
isTransitive = true
}

// Make sure friends libraries are on the classpath
configurations.findByName("implementation")?.extendsFrom(friends)

// Make these libraries friends :)
tasks.withType<KotlinCompile>().configureEach {
friendPaths.from(friends.incoming.artifactView { }.files)
}
}

/** Configure publishing and signing for published Java and JavaPlatform subprojects. */
Expand Down
2 changes: 1 addition & 1 deletion mockwebserver-deprecated/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tasks.jar {
}

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Seems like this requires two configurations: implementationFriend and apiFriend. Otherwise you are changing the visibility of the transitive dependency, as evidence by all the unrelated changes below where you are having to add the dependency yourself when it should be automatically available.

api(projects.mockwebserver3)
api(libs.junit)

Expand Down
1 change: 0 additions & 1 deletion mockwebserver-deprecated/src/main/kotlin/okhttp3/mockwebserver/MockResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.mockwebserver

Expand Down
1 change: 1 addition & 0 deletions mockwebserver-junit4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ tasks.jar {
}

dependencies {
api(projects.okhttp)
api(projects.mockwebserver3)
api(libs.junit)

Expand Down
1 change: 1 addition & 0 deletions mockwebserver-junit5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ tasks {
}

dependencies {
api(projects.okhttp)
api(projects.mockwebserver3)
api(libs.junit.jupiter.api)
compileOnly(libs.animalsniffer.annotations)
Expand Down
2 changes: 1 addition & 1 deletion mockwebserver/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tasks.jar {
}

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)

testImplementation(projects.okhttpTestingSupport)
testImplementation(projects.okhttpTls)
Expand Down
1 change: 0 additions & 1 deletion mockwebserver/src/main/kotlin/mockwebserver3/MockResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package mockwebserver3

Expand Down
1 change: 0 additions & 1 deletion mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package mockwebserver3

Expand Down
1 change: 0 additions & 1 deletion mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package mockwebserver3

Expand Down
2 changes: 1 addition & 1 deletion okhttp-dnsoverhttps/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ project.applyOsgi(
)

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)
compileOnly(libs.findbugs.jsr305)

testImplementation(projects.okhttpTestingSupport)
Expand Down
7 changes: 4 additions & 3 deletions okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsOverHttps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,17 @@ class DnsOverHttps internal constructor(
Request.Builder().header("Accept", DNS_MESSAGE.toString()).apply {
val query = DnsRecordCodec.encodeQuery(hostname, type)

val dnsUrl: HttpUrl = [email protected]
if (post) {
url(url)
url(dnsUrl)
.cacheUrlOverride(
url.newBuilder()
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)
}
Expand Down
1 change: 0 additions & 1 deletion okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsRecordCodecTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.dnsoverhttps

Expand Down
2 changes: 1 addition & 1 deletion okhttp-java-net-cookiejar/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ project.applyOsgi(
)

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)
compileOnly(libs.findbugs.jsr305)
compileOnly(libs.animalsniffer.annotations)
}
Expand Down
1 change: 0 additions & 1 deletion okhttp-java-net-cookiejar/src/main/kotlin/okhttp3/java/net/cookiejar/JavaNetCookieJar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.java.net.cookiejar

Expand Down
2 changes: 1 addition & 1 deletion okhttp-logging-interceptor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ project.applyOsgi(
)

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)
compileOnly(libs.findbugs.jsr305)

testCompileOnly(libs.findbugs.jsr305)
Expand Down
1 change: 0 additions & 1 deletion okhttp-logging-interceptor/src/main/kotlin/okhttp3/logging/HttpLoggingInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.logging

Expand Down
2 changes: 0 additions & 2 deletions okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,6 @@ class HttpLoggingInterceptorTest {
.assertNoMoreLogs()
}

@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@Test
fun sensitiveQueryParamsAreRedacted() {
url = server.url("/api/login?user=test_user&authentication=basic&password=confidential_password")
Expand Down Expand Up @@ -951,7 +950,6 @@ class HttpLoggingInterceptorTest {
.assertNoMoreLogs()
}

@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@Test
fun preserveQueryParamsAfterRedacted() {
url =
Expand Down
2 changes: 1 addition & 1 deletion okhttp-testing-support/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

dependencies {
api(libs.squareup.okio)
api(projects.okhttp)
"friends"(projects.okhttp)
api(projects.okhttpTls)
api(libs.assertk)
api(libs.bouncycastle.bcprov)
Expand Down
1 change: 0 additions & 1 deletion okhttp-testing-support/src/main/kotlin/okhttp3/CallEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3

Expand Down
1 change: 0 additions & 1 deletion okhttp-testing-support/src/main/kotlin/okhttp3/ConnectionEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3

Expand Down
1 change: 0 additions & 1 deletion okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3

Expand Down
5 changes: 0 additions & 5 deletions okhttp-testing-support/src/main/kotlin/okhttp3/TestValueFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress(
"CANNOT_OVERRIDE_INVISIBLE_MEMBER",
"INVISIBLE_MEMBER",
"INVISIBLE_REFERENCE",
)

package okhttp3

Expand Down
3 changes: 2 additions & 1 deletion okhttp-testing-support/src/main/kotlin/okhttp3/internal/concurrent/TaskFaker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.internal.concurrent

Expand Down Expand Up @@ -369,6 +368,8 @@ class TaskFaker : Closeable {
val editCountBefore = editCount
yieldUntil { nanoTime >= waitUntil || editCount > editCountBefore }
}
// TODO report compiler bug
TODO("Can't get here")
}
}

Expand Down
1 change: 0 additions & 1 deletion okhttp-testing-support/src/main/kotlin/okhttp3/internal/http/RecordingProxySelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.internal.http

Expand Down
2 changes: 1 addition & 1 deletion okhttp-tls/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ project.applyOsgi(

dependencies {
api(libs.squareup.okio)
implementation(projects.okhttp)
"friends"(projects.okhttp)
compileOnly(libs.findbugs.jsr305)
compileOnly(libs.animalsniffer.annotations)

Expand Down
1 change: 0 additions & 1 deletion okhttp-tls/src/main/kotlin/okhttp3/tls/HandshakeCertificates.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.tls

Expand Down
1 change: 0 additions & 1 deletion okhttp-tls/src/main/kotlin/okhttp3/tls/internal/InsecureExtendedTrustManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3.tls.internal

Expand Down
2 changes: 1 addition & 1 deletion okhttp-urlconnection/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ project.applyOsgi(
)

dependencies {
api(projects.okhttp)
"friends"(projects.okhttp)
api(projects.okhttpJavaNetCookiejar)
compileOnly(libs.findbugs.jsr305)
compileOnly(libs.animalsniffer.annotations)
Expand Down
1 change: 0 additions & 1 deletion okhttp-urlconnection/src/main/kotlin/okhttp3/JavaNetCookieJar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")

package okhttp3

Expand Down
2 changes: 1 addition & 1 deletion samples/guide/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
implementation(projects.okhttp)
"friends"(projects.okhttp)
implementation(projects.mockwebserver)
implementation(projects.okhttpTestingSupport)
implementation(projects.okhttpTls)
Expand Down
2 changes: 1 addition & 1 deletion samples/guide/src/main/java/okhttp3/recipes/kt/WiresharkExample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "Since15")
@file:Suppress("Since15")

package okhttp3.recipes.kt

Expand Down
2 changes: 1 addition & 1 deletion samples/guide/src/main/java/okhttp3/recipes/kt/YubikeyClientAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "Since15")
@file:Suppress("Since15")

package okhttp3.recipes.kt

Expand Down
1 change: 1 addition & 0 deletions samples/slack/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
}

dependencies {
implementation(projects.okhttp)
implementation(projects.mockwebserver)
implementation(libs.squareup.moshi)
}
1 change: 1 addition & 0 deletions samples/static-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ tasks.jar {
}

dependencies {
implementation(projects.okhttp)
implementation(projects.mockwebserver)
}

Expand Down
Loading