Skip to content

Commit 7ecb4ca

Browse files
committed
Disable usage of forked OkHttp
1 parent 33b8f88 commit 7ecb4ca

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

build.gradle.kts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ val dependencyVersionsByGroup = mapOf(
4040
subprojects {
4141
repositories {
4242
// mavenLocal()
43-
listOf(
44-
"gesellix/okhttp",
45-
// "docker-client/*",
46-
).forEach { slug ->
47-
// fun findProperty(s: String) = project.findProperty(s) as String?
48-
maven {
49-
name = "githubPackages"
50-
url = uri("https://maven.pkg.github.com/${slug}")
51-
credentials(PasswordCredentials::class)
52-
// credentials {
53-
// username = System.getenv("PACKAGE_REGISTRY_USER") ?: findProperty("github.package-registry.username")
54-
// password = System.getenv("PACKAGE_REGISTRY_TOKEN") ?: findProperty("github.package-registry.password")
55-
// }
56-
}
57-
}
43+
// listOf<String>(
44+
//// "gesellix/okhttp",
45+
//// "docker-client/*",
46+
// ).forEach { slug ->
47+
//// fun findProperty(s: String) = project.findProperty(s) as String?
48+
// maven {
49+
// name = "githubPackages"
50+
// url = uri("https://maven.pkg.github.com/${slug}")
51+
// credentials(PasswordCredentials::class)
52+
//// credentials {
53+
//// username = System.getenv("PACKAGE_REGISTRY_USER") ?: findProperty("github.package-registry.username")
54+
//// password = System.getenv("PACKAGE_REGISTRY_TOKEN") ?: findProperty("github.package-registry.password")
55+
//// }
56+
// }
57+
// }
5858
mavenCentral()
5959
}
6060
}
@@ -70,10 +70,10 @@ allprojects {
7070
useVersion(forcedVersion)
7171
}
7272
}
73-
dependencySubstitution {
74-
substitute(module("com.squareup.okhttp3:okhttp-jvm"))
75-
.using(module("de.gesellix.okhttp3-forked:okhttp-jvm:${libs.versions.okhttp.get()}"))
76-
}
73+
// dependencySubstitution {
74+
// substitute(module("com.squareup.okhttp3:okhttp-jvm"))
75+
// .using(module("de.gesellix.okhttp3-forked:okhttp-jvm:${libs.versions.okhttp.get()}"))
76+
// }
7777
}
7878
}
7979
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
3131
moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
3232
moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
3333
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
34-
okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver3-junit5", version.ref = "okhttp" }
34+
okhttpMockwebserverJunit5 = { module = "com.squareup.okhttp3:mockwebserver3-junit5", version.ref = "okhttp" }
3535
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
3636
okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
3737
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
3838

3939
[bundles]
4040
kotlin = ["kotlin", "kotlinCommon", "kotlinJdk7", "kotlinJdk8", "kotlinReflect", "kotlinScriptingJvm", "kotlinStdlib", "kotlinTest"]
4141
moshi = ["moshi", "moshiKotlin"]
42-
okhttp = ["okhttp", "okhttpMockwebserver"]
42+
okhttp = ["okhttp", "okhttpMockwebserverJunit5"]
4343
okio = ["okio", "okioJvm"]
4444

4545
[plugins]

0 commit comments

Comments
 (0)